Release v1.5

predprs/Program.cs

@@ -1,11 +1,6 @@
-using System;
+using System.Diagnostics;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Combinatorics.Collections;
+using System.Collections.Generic;
 using static System.Console;
 
 namespace predprs
@@ -14,7 +9,7 @@ namespace predprs
     {
         static void Main(string[] args)
         {
-            double[,] matrix = new double[,]
+            double[,] matrix = new double[,]            //матрица прибылей
             {
                 { 0, 0, 0, 0, 0 },
                 { 0.5, 0.1, 0.6, 0.3, 1.0 },
@@ -29,115 +24,44 @@ namespace predprs
                 { 3, 3.5, 1.8, 1.5, 1.3 }
             };
 
-            for(int i = 0; i < matrix.GetLength(0); i++)
+            for(int i = 0; i < matrix.GetLength(0); i++)//её вывод
             {
                 for (int j = 0; j < matrix.GetLength(1); j++) Write("{0:0.0} ", matrix[i, j]);
                 WriteLine();
             }
             WriteLine("\n\n");
 
-            int[] data = new int[11];
+            int[] data = { 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10 };
-            for (int i = 0; i < 11; i++) data[i] = i;
+            Variations<int> variations = new Variations<int>(data, 5);//всевозможные чиcла в комбинациях
-            //foreach (int i in data) Write(i + " ");
-            WriteLine("\n");
-
-            int[] data2 = { 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 4, 4, 5, 5, 6, 7, 8, 9, 10 };
-
-
-            //Variations<int> variations = new Variations<int>(data, 5);
-            Variations<int> variations = new Variations<int>(data2, 5);
-
-            //Permutations<int> variations = new Permutations<int>(data, GenerateOption.WithRepetition);
-            string bestStr = string.Empty;
 
             Stopwatch sw = new Stopwatch();
             sw.Start();
 
-            //List<string> resus = new List<string>();
+            HashSet<string> bestResult = new HashSet<string>();
-
+            double best = 0;
-            List<Routes> bestResult = new List<Routes>();
-            bestResult.Add(new Routes { Inc = 0, Route = "" });
-            //Results str = new Results();
-            //str.Res = 0;
-            //str.BestSt = string.Empty;
-
             foreach (IList<int> v in variations)
             {
-                if (v[0] + v[1] + v[2] + v[3] + v[4] == 10)
+                if (v[0] + v[1] + v[2] + v[3] + v[4] == 10)         //проверка, если количество мешков 10
                 {
                     double result = matrix[v[0], 0] + matrix[v[1], 1] + matrix[v[2], 2] + matrix[v[3], 3] + matrix[v[4], 4];
-                    //result.CompareTo(bestResult[0].Inc);
+                    if (result > best)                              //если найдено значение с бОльшей прибылью
-                    if (result > bestResult[0].Inc)
                     {
-                        // на всякий случай поля объекта делую нулевыми
+                        best = result;
-                        //str.Res = 0;
-                        //str.BestSt = string.Empty;
-
-
                         bestResult.Clear();                        //отчистка листа при нахождении большего результата
-
+                        bestResult.Add(string.Format("[{0} {1} {2} {3} {4}]", v[0], v[1], v[2], v[3], v[4])); //добавление объекта в хешсет
-                        //запись в поля объекта данных
-                        //str.Res = result;
-                        bestStr = string.Format("[{0} {1} {2} {3} {4}]", v[0], v[1], v[2], v[3], v[4]);
-                        bestResult.Add(new Routes { Inc = result, Route = bestStr }); //добавление объекта в лист
-
-                        //best = result;
-                        //bestStr = string.Format("[{0} {1} {2} {3} {4}]", v[0], v[1], v[2], v[3], v[4]);
-
                     }
-                    // если результаты совпали но строки отличаются (что-то тут странное происходит)
+                    else if (result == best)
-                    else if (result == bestResult[0].Inc)// && str.BestSt != string.Format("[{0} {1} {2} {3} {4}]", v[0], v[1], v[2], v[3], v[4]))
+                        bestResult.Add(string.Format("[{0} {1} {2} {3} {4}]", v[0], v[1], v[2], v[3], v[4])); //если количество прибыли одинаково
-                    {
-                        // на всякий случай поля объекта делую нулевыми
-                        //str.Res = 0;
-                        //str.BestSt = string.Empty;
-
-                        bool check = true;
-                        string temp = string.Format("[{0} {1} {2} {3} {4}]", v[0], v[1], v[2], v[3], v[4]);
-                        foreach (var vr in bestResult) if (temp == vr.Route) check = false;
-
-                        if (check)
-                        {
-                            bestResult.Add(new Routes { Inc = result, Route = temp });
                 }
-
-
-
-                        //запись в поля объекта данных
-                        //str.Res = result;
-                        //str.BestSt = string.Format("[{0} {1} {2} {3} {4}]", v[0], v[1], v[2], v[3], v[4]);
-                        //bestResult.Add(str);//добавление объекта в лист
             }
 
-                    //if (result == 5.4 && tr)
+            string answer = string.Empty;
-                    //{
-                    //    resus.Add(r);
-                    //    tr = false;
-                    //}
-
-                    //WriteLine("[{0} {1} {2} {3} {4}]   {5}", v[0], v[1], v[2], v[3], v[4], result);
-                    //Thread.Sleep(100);
-                }
-            }
-            //foreach (string s in resus) WriteLine(s);
-            sw.Stop();
-            // вывод листа 
-            WriteLine(bestResult.Count);
             foreach (var route in bestResult)
-            {
+                answer += route + "\n";
-
-                WriteLine("Наибольшая прибыль при {0} со значением {1}", route.Inc, route.Route);
-            }
-
 
-            WriteLine("{0} ms", sw.ElapsedMilliseconds);
+            sw.Stop();
+            WriteLine("Наибольшая прибыль при: \n{0}Cо значением {1}\n{2} ms", answer, best, sw.ElapsedMilliseconds);
             ReadKey();
         }
-
-       class Routes
-        {
-           public double Inc { get; set; }
-           public string Route { get; set; }
-        }
     }
 }

predprs/predprs.csproj

@@ -35,76 +35,59 @@
   <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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </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>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />