Changeset 14927 for branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification

Timestamp:

05/04/17 17:19:35 (7 years ago)

Author:

gkronber

Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification

Files:

• Calculator.cs (modified) (1 diff)
• RunCollectionDiscretizer.cs (modified) (11 diffs)
• RunCollectionFormulaModifer.cs (modified) (1 diff)
• RunCollectionGroupCreater.cs (modified) (3 diffs)
• RunCollectionRunRemover.cs (modified) (2 diffs)
• RunCollectionSorter.cs (modified) (2 diffs)
• RunCollectionValueRemover.cs (modified) (2 diffs)

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.cs

@@ -29 +29 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
 
-  [StorableClass]
+  [StorableType("aa7e5351-a2e2-45e8-9213-f0fdfd320d4a")]
   public class Calculator : IDeepCloneable {
 

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionDiscretizer.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
@@ -34 +34 @@
     "Creates several levels from the distribution of a certain result accross a run collection and " +
     "assigns a discretized value. Non-existing numbers as well as NaN and infinities are excluded from the caluclation.")]
-  [StorableClass]
+  [StorableType("706dd5f8-e2a1-4276-a238-7efdddde710a")]
   public class RunCollectionDiscretizer : ParameterizedNamedItem, IRunCollectionModifier {
 
@@ -52 +52 @@
     public ValueParameter<StringValue> GroupByParameter {
       get { return (ValueParameter<StringValue>)Parameters["GroupBy"]; }
-    }    
+    }
     public ValueParameter<ItemList<StringValue>> LevelsParameter {
       get { return (ValueParameter<ItemList<StringValue>>)Parameters["Levels"]; }
-    }    
+    }
     #endregion
 
@@ -62 +62 @@
       get { return TargetParameter.Value.Value; }
       set { TargetParameter.Value.Value = value; }
-    }    
+    }
     private double Spread { get { return SpreadParameter.Value.Value; } }
     private string GroupBy { get { return GroupByParameter.Value.Value; } }
     private List<string> Levels { get { return LevelsParameter.Value.Select(v => v.Value).ToList(); } }
 
-      #region Construction & Cloning
+    #region Construction & Cloning
     [StorableConstructor]
     protected RunCollectionDiscretizer(bool deserializing) : base(deserializing) { }
@@ -86 +86 @@
           new StringValue("High"),
           new StringValue("Very High"),
-        }));     
+        }));
       RegisterEvents();
       UpdateName();
@@ -117 +117 @@
         Target,
         Source,
-        string.IsNullOrWhiteSpace(GroupBy) ? "" : string.Format("/{0}", GroupBy));        
+        string.IsNullOrWhiteSpace(GroupBy) ? "" : string.Format("/{0}", GroupBy));
       OnNameChanged();
     }
@@ -125 +125 @@
     public void Modify(List<IRun> runs) {
       foreach (var group in runs
-        .Select(r => new {Run=r, Value=GetSourceValue(r)})
+        .Select(r => new { Run = r, Value = GetSourceValue(r) })
         .Where(r => r.Value.HasValue && !double.IsNaN(r.Value.Value) && !double.IsInfinity(r.Value.Value))
-        .Select(r => new {r.Run, r.Value.Value, Bin=GetGroupByValue(r.Run)})
+        .Select(r => new { r.Run, r.Value.Value, Bin = GetGroupByValue(r.Run) })
         .GroupBy(r => r.Bin).ToList()) {
         var values = group.Select(r => r.Value).ToList();
@@ -145 +145 @@
           }
         }
-      }      
+      }
     }
 
@@ -169 +169 @@
       variables.TryGetValue(Source, out value);
       var intValue = value as IntValue;
-      if (intValue != null) 
+      if (intValue != null)
         return intValue.Value;
       var doubleValue = value as DoubleValue;
@@ -178 +178 @@
 
     private string Discretize(double value, double avg, double stdDev) {
-      double dev = (value - avg)/(stdDev*Spread);
+      double dev = (value - avg) / (stdDev * Spread);
       int index;
       if (Levels.Count % 2 == 1) {
-        index = (int) Math.Floor(Math.Abs(dev));
-        index = (Levels.Count - 1)/2 + Math.Sign(dev) * index;
+        index = (int)Math.Floor(Math.Abs(dev));
+        index = (Levels.Count - 1) / 2 + Math.Sign(dev) * index;
       } else {
-        index = (int) Math.Ceiling(Math.Abs(dev));
+        index = (int)Math.Ceiling(Math.Abs(dev));
         if (dev > 0)
-          index = Levels.Count/2 + index;
+          index = Levels.Count / 2 + index;
         else
-          index = Levels.Count/2 + 1 - index;
+          index = Levels.Count / 2 + 1 - index;
       }
       return Levels[Math.Min(Levels.Count - 1, Math.Max(0, index))];
@@ -195 +195 @@
     private string Discretize(double value, double[] values) {
       var index = Array.BinarySearch(values, value);
-      var pos = 1.0*(index < 0 ? ~index : index)/(values.Length-1);
-      return Levels[Math.Min(Levels.Count - 1, Math.Max(0, (int) Math.Round(pos*(Levels.Count-1))))];
+      var pos = 1.0 * (index < 0 ? ~index : index) / (values.Length - 1);
+      return Levels[Math.Min(Levels.Count - 1, Math.Max(0, (int)Math.Round(pos * (Levels.Count - 1))))];
     }
 

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionFormulaModifer.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
 
   [Item("RunCollection Formula Modifier", "Modifies a RunCollection by adding results using the given formula.")]
-  [StorableClass]
+  [StorableType("03ddcd5a-a2a0-416e-8ea0-d029cdbc5779")]
   public class RunCollectionFormulaModifer : ParameterizedNamedItem, IRunCollectionModifier {
 

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionGroupCreater.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
 
   [Item("RunCollection Group Creater", "Regroups existing runs according to equal values in GroupBy and prefixes them according to their value in Prefix.")]
-  [StorableClass]
+  [StorableType("ef5dd619-133c-4c72-9730-d330b9bf2c04")]
   public class RunCollectionGroupCreater : ParameterizedNamedItem, IRunCollectionModifier {
-    
+
     public ValueParameter<ItemCollection<StringValue>> GroupByParameter {
       get { return (ValueParameter<ItemCollection<StringValue>>)Parameters["GroupBy"]; }
@@ -54 +54 @@
         new ItemCollection<StringValue>(new[] { new StringValue("Problem Name") })));
       Parameters.Add(new ValueParameter<StringValue>("Prefix", "The distinguishing prefix values for the individual runs.",
-        new StringValue("Algorithm Name")));      
+        new StringValue("Algorithm Name")));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -100 +100 @@
         name = string.Format("{0}_{1}.{2}", prefix, ++n, key);
       }
-      dict.Add(name, value);      
+      dict.Add(name, value);
     }
   }

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionRunRemover.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
   [Item("RunCollection Run Remover", "Removes all currently visible runs. Use the filtering tab to selectively remove runs.")]
-  [StorableClass]
+  [StorableType("43df1d21-d925-479e-90fb-91624836bd29")]
   public class RunCollectionRunRemover : ParameterizedNamedItem, IRunCollectionModifier {
 
@@ -33 +33 @@
     [StorableConstructor]
     protected RunCollectionRunRemover(bool deserializing) : base(deserializing) { }
-    protected RunCollectionRunRemover(RunCollectionRunRemover original, Cloner cloner) : base(original, cloner) {}
-    public RunCollectionRunRemover() {}
+    protected RunCollectionRunRemover(RunCollectionRunRemover original, Cloner cloner) : base(original, cloner) { }
+    public RunCollectionRunRemover() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RunCollectionRunRemover(this, cloner);

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionSorter.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
   [Item("RunCollection Sorter", "Sorts a run collection according the specified key variable.")]
-  [StorableClass]
+  [StorableType("95b92306-f4fd-4e40-b599-cc5a9b225293")]
   public class RunCollectionSorter : ParameterizedNamedItem, IRunCollectionModifier {
 
@@ -100 +100 @@
     public void Modify(List<IRun> runs) {
       var sortedRuns = runs
-        .Select(r => new {Run = r, Key = GetValue(r)})
+        .Select(r => new { Run = r, Key = GetValue(r) })
         .OrderBy(r => r.Key, Comparer)
         .Select(r => r.Run).ToList();

branches/PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.cs

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Optimization {
 
   [Item("RunCollection Value Remover", "Modifies a RunCollection by removing results or parameters.")]
-  [StorableClass]
+  [StorableType("18b2175c-a5b3-4307-865c-704d99577de1")]
   public class RunCollectionValueRemover : ParameterizedNamedItem, IRunCollectionModifier {
-    
+
     public ValueParameter<CheckedItemCollection<StringValue>> ValuesParameter {
       get { return (ValueParameter<CheckedItemCollection<StringValue>>)Parameters["Values"]; }
@@ -51 +51 @@
     }
     public RunCollectionValueRemover() {
-      Parameters.Add(new ValueParameter<CheckedItemCollection<StringValue>>("Values", "The result or parameter values to be removed from each run."));      
+      Parameters.Add(new ValueParameter<CheckedItemCollection<StringValue>>("Values", "The result or parameter values to be removed from each run."));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RunCollectionValueRemover(this, cloner);
-    }    
-    #endregion    
+    }
+    #endregion
 
-    public void Modify(List<IRun> runs) {      
+    public void Modify(List<IRun> runs) {
       foreach (var run in runs) {
         foreach (var value in Values) {
           run.Parameters.Remove(value);
           run.Results.Remove(value);
-        }        
-      }      
+        }
+      }
     }
-    
+
   }
 }