Changeset 18055 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Optimization

Timestamp:

09/16/21 15:27:07 (3 years ago)

Author:

dpiringe

Message:

#3026

• added StorableTypeAttribute and StorableConstructorAttribute to all JsonItems
• added a new JsonItem ListJsonItem + Interfaces IListJsonItem
• renamed SymRegPythonProcessor to RunCollectionSRSolutionPythonFormatter
• removed Interface IResultCollectionProcessor -> using the interface IRunCollectionModifier now (has aleady implementations)
• renamed all related variables/fields/properties with a connection to ResultCollectionProcessor
• added new implementations for IRunCollectionModifier

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.cs (modified) (4 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.cs

@@ -27 +27 @@
 using HeuristicLab.Parameters;
 using HEAL.Attic;
+using HeuristicLab.Collections;
 
 namespace HeuristicLab.Optimization {
@@ -38 +39 @@
     }
 
+    public IFixedValueParameter<BoolValue> InvertParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters["Invert"]; }
+    }
+
     public IEnumerable<string> Values {
       get { return ValuesParameter.Value.CheckedItems.Select(v => v.Value); }
     }
+
+    public bool Invert => InvertParameter.Value.Value;
 
     #region Construction & Cloning    
@@ -49 +56 @@
     }
     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."));
+      Parameters.Add(new FixedValueParameter<BoolValue>("Invert", "Inverts the filter strategy: Blackbox <-> Whitebox (Default: Blackbox)", new BoolValue(false)));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -56 +64 @@
     #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);
-        }        
-      }      
+        if (Invert) { //Whitebox
+          var parametersCopy = new ObservableDictionary<string, IItem>(run.Parameters);
+          var resultsCopy = new ObservableDictionary<string, IItem>(run.Results);
+          foreach(var param in parametersCopy)
+            if (!Values.Any(x => x == param.Key))
+              run.Parameters.Remove(param.Key);
+          foreach (var result in resultsCopy)
+            if (!Values.Any(x => x == result.Key))
+              run.Results.Remove(result.Key);
+        } else { //Blackbox
+          foreach (var value in Values) {
+            run.Parameters.Remove(value);
+            run.Results.Remove(value);
+          }
+        }
+      }   
     }