Changeset 16129

Timestamp:

09/10/18 09:02:33 (6 years ago)

Author:

abeham

Message:

#2457: as calculated

Location:

branches/2457_ExpertSystem/ProblemInstanceIdentifier

Files:

• InstanceExplorer.cs (modified) (2 diffs)
• Program.cs (modified) (2 diffs)

branches/2457_ExpertSystem/ProblemInstanceIdentifier/InstanceExplorer.cs

@@ -27 +27 @@
     public ISet<string> Features { get; set; }
 
+    public bool BestImprovement { get; set; }
+
     public PathRelinkingExplorer() {
       
@@ -34 +36 @@
       var calculator = new QAPDirectedWalk {
         Problem = problem,
-        BestImprovement = true,
+        BestImprovement = BestImprovement,
         Paths = Paths,
         Seed = seed,

branches/2457_ExpertSystem/ProblemInstanceIdentifier/Program.cs

@@ -44 +44 @@
       using (var writer = File.CreateText("results.csv")) {
         writer.AutoFlush = true;
-        var header = string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}",
-          "Rep", "FSet", "Type", "TrainEff", "TestEff", "ExCnt", "ExRnk", "ClsCnt", "ClsRnk", "TotCnt", "TrainEff2", "TestEff2");
+        var header = string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}\t{11}\t{12}",
+          "Rep", "Dimension", "FSet", "Type", "TrainEff", "TestEff", "ExCnt", "ExRnk", "ClsCnt", "ClsRnk", "TotCnt", "TrainEff2", "TestEff2");
         writer.WriteLine(header);
         Console.WriteLine(header);
@@ -55 +55 @@
 
                 var explorers = from p in dwPaths
-                                select new PathRelinkingExplorer() { Features = feat.Value, Paths = p, Type = type.Value };
-                ExploreMatching(writer, instances, explorers.ToArray(), explorers.ToArray(), string.Format("{0}\t{1}\t{2}", rep, feat.Key, type.Key));
+                                select new PathRelinkingExplorer() { Features = feat.Value, Paths = p, Type = type.Value, BestImprovement = false };
+                ExploreMatching(writer, instances, explorers.ToArray(), explorers.ToArray(), string.Format("{0}\t{1}\t{2}\t{3}", rep, dim, feat.Key, type.Key));
               }
             }