Changeset 10141 for branches

Timestamp:

11/20/13 10:44:12 (11 years ago)

Author:

ascheibe

Message:

#1886

• renamed MenuItem for the HiveRunCollectionModifier
• deactivated calculation of complete convex hull for permutations

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RunCollectionModifiers/PermutationConvexHullModifier.cs (modified) (2 diffs)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/HeuristicLab.Analysis.SolutionCaching.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching.Views/3.3/ModifyRunCollectionMenuItem.cs (moved) (moved from branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching.Views/3.3/CreateRunCollectionModifierTasksMenuItem.cs) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/RunCollectionModifiers/PermutationConvexHullModifier.cs

@@ -61 +61 @@
         nrOfPointsTable.Rows.Add(dtNrPointsRow);
 
-        List<double[]> curHull = null;
         var sols = solutionCache.GetSolutionsFromGeneration(i);
-        int dim = sols.First().Length;
+        int dim;
+        double[][] dm;
+        double[][] popPoints;
         while (sols.Count != 0) {
-          double[][] dm = CalculateDistanceMatrixFromPermutations(sols);
+          dm = CalculateDistanceMatrixFromPermutations(sols);
 
+          dim = sols.First().Length;
           if (dim > dm.Length)
             dim = dm.Length - 1;
 
-          double[][] popPoints = DistanceMatrixToPoints.MetricMDS(dm, dim);
+          popPoints = DistanceMatrixToPoints.MetricMDS(dm, dim);
 
           var convexHull = LPHull.Calculate(popPoints);
@@ -77 +79 @@
           dtNrPointsRow.Values.Add(convexHull.Count);
 
-          if (curHull == null) {
-            curHull = convexHull;
-          } else {
-            var newPHull = curHull.Union(convexHull).ToArray();
-            curHull = LPHull.Calculate(newPHull);
-          }
-
           sols = solutionCache.GetSolutionsFromGeneration(++i);
         }
-        overallVolumn.Value = ConvexHullMeasures.CalculateVolume(curHull);
 
-        run.Results.Add("Overall volumn: ", overallVolumn);
+        //calculate convex hull for all individuals
+        /* dm = CalculateDistanceMatrixFromPermutations(solutionCache.Keys().ToList());
+         dim = solutionCache.Keys().First().Length;
+         if (dim > dm.Length)
+           dim = dm.Length - 1;
+         popPoints = DistanceMatrixToPoints.MetricMDS(dm, dim);
+
+         List<double[]> allPoints = LPHull.Calculate(popPoints);
+         overallVolumn.Value = ConvexHullMeasures.CalculateVolume(allPoints);*/
+
+        //run.Results.Add("Overall volumn: ", overallVolumn);
         run.Results.Add("Convex hull volumn", volDataTable);
         run.Results.Add("Convex nr. of points", nrOfPointsTable);

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching.Views/3.3/HeuristicLab.Analysis.SolutionCaching.Views-3.3.csproj

@@ -144 +144 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CreateRunCollectionModifierTasksMenuItem.cs" />
+    <Compile Include="ModifyRunCollectionMenuItem.cs" />
     <Compile Include="RunCollectionModifierExecutableView.cs">
       <SubType>UserControl</SubType>

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching.Views/3.3/ModifyRunCollectionMenuItem.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Analysis.SolutionCaching.Views {
-  internal class CreateRunCollectionModifierTasksMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
+  internal class ModifyRunCollectionMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
     public override string Name {
-      get { return "&Configure RunCollectionModiefiers for Hive"; }
+      get { return "&Modify RunCollection"; }
     }
     public override IEnumerable<string> Structure {