Changeset 7938

Timestamp:

05/30/12 17:21:52 (13 years ago)

Author:

spimming

Message:

#1853:

• allow to set range constraints
• when parameterizing, special case for fixed value parameters

Location:

branches/DataAnalysisService/HeuristicLab.Encodings.ParameterConfigurationTreeEncoding/3.3

Files:

• HeuristicLab.Encodings.ParameterConfigurationTreeEncoding.csproj (modified) (1 diff)
• ParameterConfigurations/ParameterConfiguration.cs (modified) (1 diff)
• RangeConstraints/IntValueFactorRange.cs (added)

branches/DataAnalysisService/HeuristicLab.Encodings.ParameterConfigurationTreeEncoding/3.3/HeuristicLab.Encodings.ParameterConfigurationTreeEncoding.csproj

@@ -76 +76 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RangeConstraints\ConstrainedValue.cs" />
+    <Compile Include="RangeConstraints\IntValueFactorRange.cs" />
     <Compile Include="RangeConstraints\DoubleValueFactorRange.cs" />
     <Compile Include="RangeConstraints\DoubleValueRange.cs" />

branches/DataAnalysisService/HeuristicLab.Encodings.ParameterConfigurationTreeEncoding/3.3/ParameterConfigurations/ParameterConfiguration.cs

@@ -556 +556 @@
       var clonedValue = this.ActualValue.Value != null ? (IItem)this.ActualValue.Value.Clone() : null;
       if (clonedValue != null) AdaptValidValues(parameter, clonedValue);
-      parameter.Value = clonedValue;
+      if (parameter is IFixedValueParameter<IntValue>) {
+        ((IntValue)parameter.Value).Value = ((IntValue)clonedValue).Value;
+      } else if (parameter is FixedValueParameter<DoubleValue>) {
+        ((DoubleValue)parameter.Value).Value = ((DoubleValue)clonedValue).Value;
+      } else {
+        parameter.Value = clonedValue;
+      }
     }