Changeset 14696 for branches

Timestamp:

02/23/17 14:30:23 (8 years ago)

Author:

abeham

Message:

#2457: worked on instance identification

Location:

branches/PerformanceComparison/ProblemInstanceIdentifier

Files:

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

branches/PerformanceComparison/ProblemInstanceIdentifier/InstanceExplorer.cs

@@ -96 +96 @@
       if (memPr.Context.RelinkedPaths.IsEmpty
         || IncludeLocalSearch && memPr.Context.LocalSearchPaths.IsEmpty) {
-        Console.Write("{0} not all paths present!", problem.Name);
+        Console.WriteLine("{0} not all paths present!", problem.Name);
         return null;
       };

branches/PerformanceComparison/ProblemInstanceIdentifier/Program.cs

@@ -116 +116 @@
         if (bestMatch.Cls == e.Cls) clsCount++;
         if (bestMatch.Name == e.Name) exactCount++;
+        var r = ordered.FindIndex((id) => id.Name == e.Name);
+        if (r < 0) continue;
         totalCount++;
+        exactRank += r + 1;
         clsRank += ordered.FindIndex((id) => id.Cls == e.Cls) + 1;
-        exactRank += ordered.FindIndex((id) => id.Name == e.Name) + 1;
       }
 
@@ -177 +179 @@
       var experimentBase = new Dictionary<InstanceExplorer, List<InstanceDescriptor>>();
       Action<InstanceExplorer> testBody = (expExplorer) => {
-        var trainingData = GenerateData(instances, expExplorer, parallel);
-        lock (sync) {
-          experimentBase.Add(expExplorer, trainingData);
+        var testData = GenerateData(instances, expExplorer, parallel);
+        lock (sync) {
+          experimentBase.Add(expExplorer, testData);
         }
       };