Changeset 8091

Timestamp:

06/23/12 00:21:50 (12 years ago)

Author:

ascheibe

Message:

#1877 fixed NullReferenceExceptions in MetaOpt detected by TestCloningAllDeepCloneables

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

Files:

• ConstrainedTypeValue.cs (modified) (1 diff)
• Encoding/ParameterConfigurationTree.cs (modified) (4 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/ConstrainedTypeValue.cs

@@ -38 +38 @@
     protected ConstrainedTypeValue(ConstrainedTypeValue original, Cloner cloner)
       : base(original, cloner) {
-      this.validTypes = new List<Type>(original.validTypes);
+      if (original.validTypes != null)
+        this.validTypes = new List<Type>(original.validTypes);
     }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs

@@ -59 +59 @@
       }
     }
-    
+
     [Storable]
     private DoubleArray bestQualities;
@@ -185 +185 @@
       this.runs = cloner.Clone(original.runs);
       this.parameters = new Dictionary<string, IItem>();
-      foreach (var p in original.parameters) {
-        this.parameters.Add(p.Key, cloner.Clone(p.Value));
+      if (original.parameters != null) {
+        foreach (var p in original.parameters) {
+          this.parameters.Add(p.Key, cloner.Clone(p.Value));
+        }
       }
     }
@@ -194 +196 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
-      if(ProblemConfiguration != null) ProblemConfiguration.ValuesReadOnly = true;
+      if (ProblemConfiguration != null) ProblemConfiguration.ValuesReadOnly = true;
     }
     #endregion
@@ -304 +306 @@
       this.CollectResultValues(run.Results);
       this.CollectParameterValues(run.Parameters);
-      if(clearParameters) MetaOptimizationUtil.ClearParameters(run, this.GetOptimizedParameterNames());
+      if (clearParameters) MetaOptimizationUtil.ClearParameters(run, this.GetOptimizedParameterNames());
       return run;
     }