Changeset 16140 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems

Timestamp:

09/14/18 11:36:59 (6 years ago)

Author:

abeham

Message:

#2817: updated to trunk r15680

Location:

branches/2817-BinPackingSpeedup

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ChangeDataOfOptimizersMenuItem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ShrinkDataAnalysisRunsMenuItem.cs (modified) (4 diffs)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ChangeDataOfOptimizersMenuItem.cs

@@ -2 +2 @@
 
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/ShrinkDataAnalysisRunsMenuItem.cs

@@ -2 +2 @@
 
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
-using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
@@ -33 +30 @@
 
 using MenuItem = HeuristicLab.MainForm.WindowsForms.MenuItem;
-using ValuesType = System.Collections.Generic.Dictionary<string, System.Collections.IList>;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -79 +75 @@
       mainForm.AddOperationProgressToContent(activeView.Content, "Removing duplicate datasets.");
 
-      Action<IContentView> action = (view) => {
-        var variableValuesMapping = new Dictionary<ValuesType, ValuesType>();
-        foreach (var problemData in view.Content.GetObjectGraphObjects(excludeStaticMembers: true).OfType<IDataAnalysisProblemData>()) {
-          var dataset = problemData.Dataset as Dataset;
-          if (dataset == null) continue;
-          var originalValues = variableValuesGetter(dataset);
-          var matchingValues = GetEqualValues(originalValues, variableValuesMapping);
-          variableValuesSetter(dataset, matchingValues);
-        }
-      };
+      Action<IContentView> action = (view) => DatasetUtil.RemoveDuplicateDatasets(view.Content);
 
-      action.BeginInvoke(activeView, delegate(IAsyncResult result) {
+      action.BeginInvoke(activeView, delegate (IAsyncResult result) {
         action.EndInvoke(result);
         mainForm.RemoveOperationProgressFromContent(activeView.Content);
       }, null);
     }
-
-    private static ValuesType GetEqualValues(ValuesType originalValues, Dictionary<ValuesType, ValuesType> variableValuesMapping) {
-      if (variableValuesMapping.ContainsKey(originalValues)) return variableValuesMapping[originalValues];
-
-      var matchingValues = variableValuesMapping.FirstOrDefault(kv => kv.Key == kv.Value && EqualVariableValues(originalValues, kv.Key)).Key ?? originalValues;
-      variableValuesMapping[originalValues] = matchingValues;
-      return matchingValues;
-    }
-
-    private static bool EqualVariableValues(ValuesType values1, ValuesType values2) {
-      //compare variable names for equality
-      if (!values1.Keys.SequenceEqual(values2.Keys)) return false;
-      foreach (var key in values1.Keys) {
-        var v1 = values1[key];
-        var v2 = values2[key];
-        if (v1.Count != v2.Count) return false;
-        for (int i = 0; i < v1.Count; i++) {
-          if (!v1[i].Equals(v2[i])) return false;
-        }
-      }
-      return true;
-    }
-
-    private static readonly Action<Dataset, Dictionary<string, IList>> variableValuesSetter;
-    private static readonly Func<Dataset, Dictionary<string, IList>> variableValuesGetter;
-    /// <summary>
-    /// The static initializer is used to create expressions for getting and setting the private variableValues field in the dataset.
-    /// This is done by expressions because the field is private and compiled expression calls are much faster compared to standad reflection calls.
-    /// </summary>
-    static ShrinkDataAnalysisRunsMenuItem() {
-      var dataset = Expression.Parameter(typeof(Dataset));
-      var variableValues = Expression.Parameter(typeof(ValuesType));
-      var valuesExpression = Expression.Field(dataset, "variableValues");
-      var assignExpression = Expression.Assign(valuesExpression, variableValues);
-
-      var variableValuesSetExpression = Expression.Lambda<Action<Dataset, ValuesType>>(assignExpression, dataset, variableValues);
-      variableValuesSetter = variableValuesSetExpression.Compile();
-
-      var variableValuesGetExpression = Expression.Lambda<Func<Dataset, ValuesType>>(valuesExpression, dataset);
-      variableValuesGetter = variableValuesGetExpression.Compile();
-    }
   }
 }