comivoyar/App.config

@@ -1,22 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

comivoyar/Program.cs

@@ -1,73 +1,41 @@
 using System;
-using System.Diagnostics;
-using Combinatorics.Collections;
 using System.Collections.Generic;
+using System.IO;
 using static System.Console;
-using System.Threading.Tasks;
-using System.Threading;
 
 namespace komvo
 {
     class Program
     {
-        public static double[,] Matrix;
+        public static List<Point> Points = new List<Point>();
-        public static bool End;
-        public static bool EnabledPerm = false, EnabledAlg = false, EnabledAlgPar = false;
-
-        public static int[] routesCPar;
-        public static double[] routesResultsPar;
-        public static int[][] routesCPars; 
-        public static int index;
-        public static Thread CountThreads;
 
         static void Main(string[] args)
         {
-            GetEnables();
+            string file = "coord.txt";
-        Beginig:
-
-            routesResultsPar = new double[10];
-            routesCPars = new int[10][];
-            index = 0;
 
-            List<Point> Points = new List<Point>();
+            using (StreamReader cr = new StreamReader(file))
-            Random random = new Random();
-            int pCount = 0;
-
-        Retry:
-            string elems = ReadLine();
-            //WriteLine($"Elems: {elems}");
-            try
             {
-                if (elems == "w") { GetEnables(); goto Retry; }
+                string line;
-                else
+                while ((line = cr.ReadLine()) != null)
                 {
-                    pCount = Convert.ToInt32(elems);
+                    string[] str = line.Split();
-                    if (pCount < 4) { WriteLine("Слишком маленькое число"); goto Retry; }
+                    Points.Add(new Point { X = int.Parse(str[0]), Y = int.Parse(str[1]) });
+                    WriteLine(str[0] + " " + str[1]);
                 }
             }
-            catch
+            WriteLine();
-            {
-                Write("Введите натуральное число: ");
-                goto Retry;
-            }
-
-            for(int i = 0; i < pCount; i++)
-            {
-                int x = random.Next(80);
-                int y = random.Next(70);
-                Points.Add(new Point { X = x, Y = y });
-                WriteLine("Точка {0} [{1};{2}]", i + 1, x, y);
-            }
-            WriteLine("\n");
 
             int matr = Points.Count;
-            Matrix = new double[matr, matr];
+            double[,] Matrix = new double[matr, matr];
 
             for (int i = 0; i < Points.Count; i++)
+            {
                 for (int j = i; j < Points.Count - 1; j++)
+                {
                     Matrix[i, j + 1] = Matrix[j + 1, i] =
                         Math.Sqrt(Math.Pow(Points[j + 1].X - Points[i].X, 2) + Math.Pow(Points[j + 1].Y - Points[i].Y, 2));
-
+                }
+            }
 
             for (int i = 0; i < matr; i++)
             {
@@ -75,348 +43,157 @@ namespace komvo
                 WriteLine();
             }
 
+            string formP = string.Empty;
+            for (int i = 2; i <= Points.Count; i++) formP += i.ToString();
 
+            int fct = Fact(Points.Count - 1);
+            WriteLine("{0} {1}", formP, fct);
+            WriteLine("\n\n");
 
-            //-------------------------------------------------------------------------------------------------
+            int[] routes = new int[fct];
-            #region Permuts
+            double[] leng = new double[fct];
-
-            if (!EnabledPerm) goto EndOfPerm;
 
-            Stopwatch stopwatchPERM = new Stopwatch();
+            int waves = fct / 6;
-            stopwatchPERM.Start();
 
-            List<ResultRoute> resroutesPerm = new List<ResultRoute>();
+            int cn = 1, cn2 = 0;
-            int[] toSwap = new int[Points.Count - 1];
+            string inf = formP;
-            for (int i = 0; i <= toSwap.Length - 1; i++) toSwap[i] = i + 2;
+            for (int i = 1; i < waves + 1; i++)
-
-            bool first = true;
-            double opLength = 0, prevResult = 0;
-            string opRoute = string.Empty;
-
-            Permutations<int> perm = new Permutations<int>(toSwap);
-            foreach(IList<int> p in perm)
             {
-                int[] route = new int[Points.Count - 1];
+                for(int j = 0; j < 6; j++)
-                for (int i = 0; i < toSwap.Length; i++) route[i] = p[i];
-                prevResult = CountLength(Matrix, route);
-                //WriteLine(opLength);
-
-                if (first)
-                {
-                    opLength = prevResult;
-                    foreach (int i in route) opRoute += i + ";";
-                    first = false;
-                    resroutesPerm.Add(new ResultRoute(opLength, opRoute));
-                }
-                else if(opLength > prevResult)
-                {
-                    opLength = prevResult;
-                    opRoute = string.Empty;
-                    foreach (int i in route) opRoute += i + ";";
-
-                    resroutesPerm.Clear();
-                    resroutesPerm.Add(new ResultRoute(opLength, opRoute));
-                }
-                else if(opLength == prevResult)
                 {
-                    opRoute = string.Empty;
+                    if (i == 0 && j == 0) { routes[j + (i - 1) * 6] = int.Parse(formP); WriteLine(routes[j + (i - 1) * 6]); }
-                    foreach (int i in route) opRoute += i + ";";
+                    else if (j % 2 == 0) { routes[j + (i - 1) * 6] = int.Parse(formP = Swap(formP, 0, j / 2)); WriteLine(routes[j + (i - 1) * 6]); }
-                    resroutesPerm.Add(new ResultRoute(opLength, opRoute));
+                    else { routes[j + (i - 1) * 6] = int.Parse(Swap(formP, 1, 2)); WriteLine(routes[j + (i - 1) * 6]); }
                 }
-            }
-            stopwatchPERM.Stop();
-
-            WriteLine("\n\nPerms");
-            WriteLine("1;{1}1 - оптимальный маршрут длинной {0:00.00}\nИз {2} маршрутов при {3} точках\nПосчитано за {4} \n\n",
-                opLength, opRoute, Fact(Points.Count - 1), Points.Count, stopwatchPERM.Elapsed);
-            //WriteLine($"Count = {resroutesPerm.Count}");
-        EndOfPerm:
-
-
-            #endregion
-
-
-            //-------------------------------------------------------------------------------------------------
-            #region Alg
 
 
-            if (!EnabledAlg) goto ExitFromAlg;
+                if (waves > 1)
-
+                {
-            Stopwatch stopwatchNAl = new Stopwatch();
-            stopwatchNAl.Start();
-            int[] routesC = new int[Points.Count - 1];
-            for (int i = 0; i < routesC.Length; i++) routesC[i] = i + 2;
 
-            routesC[routesC.Length - 1]--;
 
-            End = false;
-            bool firstIt = true;
-            double routeLen = 0;
-            string routeName = string.Empty;
-            int routesCount = 0;
 
-            for (int numb = 0; numb < Math.Pow(Points.Count - 1, Points.Count - 1); numb++)
+                    if (i % 4 == 0 && waves > 4)
-            {
-                routesC[routesC.Length - 1] += 1;
-                Adjustment(ref routesC);
-                if (!End)
-                {
-                    if (CheckDoubles(routesC))
                     {
-                        //Write($"{CountLength(Matrix, routesC):00.00} ;");
+                        formP = Swap(formP, cn2++, 4);
-                        routesCount += 1;
+                        WriteLine("{0} {1}", formP, inf);
-                        if (firstIt)
+                    }
-                        {
+                    else
-                            routeLen = CountLength(Matrix, routesC);
+                    {
-                            foreach (int i in routesC) routeName += i + ";";
+                        switch (cn)
-                            firstIt = false;
-                        }
-                        else
                         {
-                            if (routeLen > CountLength(Matrix, routesC))
+                            case 1:
-                            {
+                                formP = Swap(formP, '2', '5');
-                                routeLen = CountLength(Matrix, routesC);
+                                cn++;
-                                routeName = string.Empty;
+                                break;
-                                foreach (int i in routesC) routeName += i + ";";
+                            case 2:
-                            }
+                                formP = Swap(formP, '3', '2');
+                                cn++;
+                                break;
+                            case 3:
+                                formP = Swap(formP, '4', '3');
+                                cn++;
+                                break;
+                            default:
+                                WriteLine("???????");
+                                break;
                         }
+                        if (cn > 3) cn = 1;
+                        //formP = Swap(inf, cn++, 3);
+                        //WriteLine("{0} {1}", formP, inf);
                     }
-                }
-                else { goto EndOfAlg; }
-            }
-            stopwatchNAl.Stop();
-
-        EndOfAlg:
-            WriteLine("Algoritm");
-            WriteLine($"1;{routeName}1 - оптимальный маршрут длинной {routeLen:00.00}\n" +
-                $"Из {routesCount} маршрутов при {Points.Count} точках\nПосчитано за {stopwatchNAl.Elapsed} \n\n");
-
-            ExitFromAlg:
-
-            #endregion
 
 
-            //-------------------------------------------------------------------------------------------------
+                        //if (cn > 4)
-            #region AlgParall
-
-            if (!EnabledAlgPar) goto EndOfAlgParExiting;
-
-            Stopwatch stopwatchNAlPar = new Stopwatch();
-            stopwatchNAlPar.Start();
-            routesCPar = new int[Points.Count - 1];
-            for (int i = 0; i < routesCPar.Length; i++) routesCPar[i] = i + 2;
-
-            routesCPar[routesCPar.Length - 1]--;
-
-            End = false;
-            string routeNamePar = string.Empty;
-
-            for (int numb = 0; numb < Math.Pow(Points.Count - 1, Points.Count - 1); numb++)
-            {
-                routesCPar[routesCPar.Length - 1] += 1;
-                Adjustment(ref routesCPar);
-                if (!End)
-                {
-                    if (CheckDoubles(routesCPar))
-                    {
-                        if (CountThreads != null)
-                            if (CountThreads.IsAlive) CountThreads.Join();
-
-                        routesCPars[index] = new int[routesCPar.Length];
-                        routesCPar.CopyTo(routesCPars[index], 0);
-
-                        index++;
-                        if (index > 9) index = 0;
-
-                        //Write($"\n{index} : ");
-                        //foreach (int i in routesCPars[index]) Write($"{i};  ");
-                        CountThreads = new Thread(() => CountLengthParall());
-                        CountThreads.Start();
-
-                        //if (CountThreads1 == null)
                         //{
-                        //    CountThreads1 = new Thread(() => CountLengthParall());
+                        //    cn = 0;
-                        //    CountThreads1.Start();
+                        //    formP = Swap(inf, cn2, 4);
+                        //    cn2++;
                         //}
-                        //else if (!CountThreads1.IsAlive)
-                        //{
-                        //    CountThreads1 = new Thread(() => CountLengthParall());
-                        //    CountThreads1.Start();
-                        //}                       
                         //else
                         //{
-                        //    CountThreads1.Join();
+                        //formP = Swap(inf, cn, 3);
-                        //    CountThreads1 = new Thread(() => CountLengthParall());
-                        //    CountThreads1.Start();
                         //}
+                        //cn++;
                     }
-                }
-                else { goto EndOfAlgPar; }
             }
-            stopwatchNAlPar.Stop();
 
-        EndOfAlgPar:
+            CountLen(ref leng, Matrix, routes);
 
-            CountThreads.Join();
+            double optim = leng[0];
-            double ddd = routesResultsPar[0];
+            int oIndex = 0;
-            for(int i = 0; i < 10; i++)
+            for (int i = 0; i < leng.Length; i++)
             {
-                if (ddd > routesResultsPar[i] & routesResultsPar[i] != 0) ddd = routesResultsPar[i];
+                WriteLine("{0:N2} - {1}", leng[i], routes[i]);
+                if (optim > leng[i])
+                {
+                    optim = leng[i];
+                    oIndex = i;
+                }
             }
 
-            WriteLine("Paralle Alg");
-            //foreach (double d in routesResultsPar) Write($"{d:00.00};  "); WriteLine();
-            WriteLine($"Result: {ddd:00.00}; Time: {stopwatchNAlPar.Elapsed}");
-
-            EndOfAlgParExiting:
-
-            #endregion
 
-
+            for (int i = 0; i < routes.Length; i++)
-            Write("Ещё раз? (y/n) ");
-            Exiting:
-            char answer = ReadKey().KeyChar;
-            switch (answer)
             {
-                case 'y':
+                for (int j = i + 1; j < routes.Length - 1; j++)
-                    Write("\nВведите количество точек больше 3 (w  для изменения алгоритммов): ");
+                    if (routes[i].Equals(routes[j])) WriteLine("{0} {2}:: {1} {3}!!!!", routes[i], routes[j], i, j);
-                    goto Beginig;
-                case 'n':
-                    goto End;
-                default:
-                    goto Exiting;
             }
+            WriteLine("\n\n1{1}1 - оптимальный маршрут длинной {0:00.00}\nВсего маршрутов {2}\n{4} {3}",
+                optim, routes[oIndex], routes.Length, fct, Points.Count);
 
-        End:
-            WriteLine("\nРабота окончена");
-            Thread.Sleep(1000);
-        }
-
-        public static void Adjustment(ref int[] route)
-        {
-            for (int i = route.Length - 1; i >= 0; i--)
-            {
-                if (route[i] > route.Length + 1)
-                {
-                    if (i == 0) { End = true; /*WriteLine("\nEnded");*/ break; }
-                    else
-                    {
-                        route[i] = 2;
-                        route[i - 1] += 1;
-                    }
-                }
-            }
-        }
 
-        public static double CountLength(double[,] mtr, int[] route)
-        {
-            double result = 0;
 
-            for (int j = 0; j < route.Length - 1; j++)
-            {
-                if (j == 0) result += mtr[0, route[j] - 1];
-                else if (j == route.Length - 1)
-                {
-                    result += mtr[route[j - 1] - 2, route[j] - 2];
-                    result += mtr[0, route[j] - 2];
-                }
-                else
-                {
-                    result += mtr[route[j - 1] - 2, route[j] - 2];
-                }
-            }
-            return result;
-        }
 
-        public static void CountLengthParall()
-        {
-            double result = 0;
-            int indexL = index - 1;
-            if (indexL == -1) indexL = 9;
-            //WriteLine($"Index: {index}");
-            int[] localRoute = routesCPars[indexL];
 
-            for (int j = 0; j < localRoute.Length - 1; j++)
+            //WriteLine(Fact(5));
-            {
+            //MessageBox.Show(Math.Sqrt(-1).ToString());
-                if (j == 0) result += Matrix[0, localRoute[j] - 1];
+            ReadKey();
-                else if (j == localRoute.Length - 1)
-                {
-                    result += Matrix[localRoute[j - 1] - 2, localRoute[j] - 2];
-                    result += Matrix[0, localRoute[j] - 2];
-                }
-                else
-                {
-                    result += Matrix[routesCPars[indexL][j - 1] - 2, routesCPars[indexL][j] - 2];
-                }
-            }
 
-            if(routesResultsPar[index] == 0 || routesResultsPar[index] > result) routesResultsPar[index] = result;
-            //index++;
-            //if (index > 9) index = 0;
         }
 
-        public static bool CheckDoubles(int[] array)
+        public static string Swap(string value, int first, int second)
         {
-            int count = array.Length;
+            char[] res = value.ToCharArray();
-            //for (int i = 0; i < count; i++) Write(array[i] + " "); WriteLine();
+            res[first] = value[second];
-            for(int i = 0; i < count; i++)
+            res[second] = value[first];
-            {
+            value = new string(res);
-                for(int j = i + 1; j < count; j++)
-                {
-                    //WriteLine($"{array[i]}[{i}] == {array[j]}[{j}] = {array[i] == array[j]}");
 
-                    if (array[i] == array[j])
+            return value;
-                    {
-                        return false;
-                    }
-                }
-            }
-            return true;
         }
 
-        public static bool YesOrNo(char ch)
+        public static string Swap(string value, char first, char second)
         {
-            switch (ch)
+            int f, s;
-            {
+            char[] res = value.ToCharArray();
-                case 'y':
+            WriteLine(f = value.IndexOf(first));
-                    return true;
+            WriteLine(s = value.IndexOf(second));
-                case 'n':
+            res[value.IndexOf(first)] = value[value.IndexOf(second)];
-                    return false;
+            res[value.IndexOf(second)] = value[value.IndexOf(first)];
-                default:
+            value = new string(res);
-                    return false;
+
-            }
+            return value;
         }
 
-        public static void GetEnables()
-        {
-
-        GetEnables:
-            Write("\nКакие алгоритмы включить (например yny: Perm: Enbled, Alg: Disabled, AlgPar: Enabled)? : ");
-
-            char[] check = ReadLine().ToCharArray();
 
-            for (int i = 0; i < check.Length; i++)
+        public static void CountLen (ref double[] result, double[,] mtr, int[] rts)
-            {
-                if (i == 0) EnabledPerm = YesOrNo(check[i]);
-                if (i == 1) EnabledAlg = YesOrNo(check[i]);
-                if (i == 2) EnabledAlgPar = YesOrNo(check[i]);
-            }
-            //EnabledAlgPar = false;
-
-            WriteLine($"Permutation Alg Enabled = {EnabledPerm}\nFull Alg Enabled = {EnabledAlg}\nFull Alg Parallel Enabled = {EnabledAlgPar}");
-
-            if (EnabledPerm == EnabledAlg & EnabledAlg == EnabledAlgPar & EnabledAlgPar == false) { WriteLine("Неверно введены параметры"); goto GetEnables; }
-            Write("\nВведите количество точек больше 3 (w  для изменения алгоритммов): ");
-        }
-
-        public class ResultRoute
         {
-            double length;
+            for (int i = 0; i < rts.Length; i++)
-            string route;
-            public ResultRoute(double len, string route)
             {
-                length = len;
+                double res = 0;
-                this.route = route;
+                char[] ch = rts[i].ToString().ToCharArray();
+                for (int j = 0; j < ch.Length; j++)
+                {
+                    if (j == 0) res += mtr[0, int.Parse(ch[j].ToString()) - 1];
+                    else if (j == ch.Length - 1)
+                    {
+                        res += mtr[int.Parse(ch[j - 1].ToString()) - 1, int.Parse(ch[j].ToString()) - 1];
+                        res += mtr[0, int.Parse(ch[j].ToString()) - 1];
+                    }
+                    else
+                    {
+                        res += mtr[int.Parse(ch[j - 1].ToString()) - 1, int.Parse(ch[j].ToString()) - 1];
+                    }
+                }
+                result[i] = res;
             }
         }
 
@@ -426,6 +203,7 @@ namespace komvo
             public int Y { get; set; }
         }
 
+
         static int Fact(int a) => a <= 1 ? 1 : a * Fact(a - 1);
     }
 }

comivoyar/bin/Debug/comivoyar.exe.config

@@ -1,22 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

comivoyar/bin/Debug/coord.txt

@@ -1,7 +1,4 @@
-1 0
+0 0
-2 10
+0 20
-3 20
+20 20
-4 30
+20 0
-5 40
-6 50
-7 60

comivoyar/comivoyar.csproj

@@ -32,66 +32,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Combinatorics, Version=1.1.0.19, Culture=neutral, PublicKeyToken=d5738f21cd5d2f66, processorArchitecture=MSIL">
-      <HintPath>..\packages\Combinatorics.1.1.0.19\lib\netstandard1.2\Combinatorics.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Win32.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
-    </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Globalization.Calendars, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="System.IO.Compression.ZipFile, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Compression.ZipFile.4.0.1\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Sockets, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -100,7 +47,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

comivoyar/obj/Debug/comivoyar.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f0bb9fd207d6bf2b73407612668fe4a2e047ddf3
+6eed873852f8ce9c50ebe974dac1f20cc4ef270e

comivoyar/obj/Debug/comivoyar.csproj.FileListAbsolute.txt

@@ -12,43 +12,3 @@ D:\Git\comvo\comivoyar\obj\Debug\comivoyar.csprojAssemblyReference.cache
 D:\Git\comvo\comivoyar\obj\Debug\comivoyar.csproj.CoreCompileInputs.cache
 D:\Git\comvo\comivoyar\obj\Debug\comivoyar.exe
 D:\Git\comvo\comivoyar\obj\Debug\comivoyar.pdb
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\Combinatorics.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\Microsoft.Win32.Primitives.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.AppContext.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Console.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Diagnostics.DiagnosticSource.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Globalization.Calendars.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.IO.Compression.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.IO.Compression.ZipFile.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.IO.FileSystem.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.IO.FileSystem.Primitives.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Net.Http.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Net.Sockets.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Runtime.InteropServices.RuntimeInformation.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Security.Cryptography.Algorithms.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Security.Cryptography.Encoding.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Security.Cryptography.Primitives.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Security.Cryptography.X509Certificates.dll
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\Combinatorics.xml
-E:\кк\прог\comivoyar\comivoyar\bin\Debug\System.Diagnostics.DiagnosticSource.xml
-E:\кк\прог\comivoyar\comivoyar\obj\Debug\comivoyar.csproj.CopyComplete
-D:\Git\comvo\comivoyar\bin\Debug\Combinatorics.dll
-D:\Git\comvo\comivoyar\bin\Debug\Microsoft.Win32.Primitives.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.AppContext.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Console.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Diagnostics.DiagnosticSource.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Globalization.Calendars.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.IO.Compression.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.IO.Compression.ZipFile.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.IO.FileSystem.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.IO.FileSystem.Primitives.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Net.Http.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Net.Sockets.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Runtime.InteropServices.RuntimeInformation.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Security.Cryptography.Algorithms.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Security.Cryptography.Encoding.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Security.Cryptography.Primitives.dll
-D:\Git\comvo\comivoyar\bin\Debug\System.Security.Cryptography.X509Certificates.dll
-D:\Git\comvo\comivoyar\bin\Debug\Combinatorics.xml
-D:\Git\comvo\comivoyar\bin\Debug\System.Diagnostics.DiagnosticSource.xml
-D:\Git\comvo\comivoyar\obj\Debug\comivoyar.csproj.CopyComplete

comivoyar/packages.config

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Combinatorics" version="1.1.0.19" targetFramework="net461" />
-  <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="net461" />
-  <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.1" targetFramework="net461" />
-  <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="NETStandard.Library" version="1.6.0" targetFramework="net461" />
-  <package id="System.AppContext" version="4.1.0" targetFramework="net461" />
-  <package id="System.Collections" version="4.0.11" targetFramework="net461" />
-  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net461" />
-  <package id="System.Console" version="4.0.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net461" />
-  <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net461" />
-  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net461" />
-  <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
-  <package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO" version="4.1.0" targetFramework="net461" />
-  <package id="System.IO.Compression" version="4.1.0" targetFramework="net461" />
-  <package id="System.IO.Compression.ZipFile" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO.FileSystem" version="4.0.1" targetFramework="net461" />
-  <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.Linq" version="4.1.0" targetFramework="net461" />
-  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Net.Http" version="4.1.0" targetFramework="net461" />
-  <package id="System.Net.Primitives" version="4.0.11" targetFramework="net461" />
-  <package id="System.Net.Sockets" version="4.1.0" targetFramework="net461" />
-  <package id="System.ObjectModel" version="4.0.12" targetFramework="net461" />
-  <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
-  <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
-  <package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net461" />
-  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
-  <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net461" />
-  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net461" />
-  <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
-  <package id="System.Text.Encoding" version="4.0.11" targetFramework="net461" />
-  <package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net461" />
-  <package id="System.Text.RegularExpressions" version="4.1.0" targetFramework="net461" />
-  <package id="System.Threading" version="4.0.11" targetFramework="net461" />
-  <package id="System.Threading.Tasks" version="4.0.11" targetFramework="net461" />
-  <package id="System.Threading.Timer" version="4.0.1" targetFramework="net461" />
-  <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net461" />
-  <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net461" />
-</packages>