Changeset 2166 for trunk

Timestamp:

07/16/09 14:23:36 (15 years ago)

Author:

gkronber

Message:

Removed range constraint on GP variable weights and constant values. #710

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• Constant.cs (modified) (1 diff)
• ModelAnalyzerExporter.cs (modified) (3 diffs)
• Variable.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Constant.cs

@@ -44 +44 @@
       GetVariableInfo(VALUE).Local = true;
 
-      ConstrainedDoubleData valueData = new ConstrainedDoubleData();
+      DoubleData valueData = new DoubleData();
       // initialize a default range for the contant value
-      valueData.AddConstraint(new DoubleBoundedConstraint(-20.0, 20.0));
       HeuristicLab.Core.Variable value = new HeuristicLab.Core.Variable(VALUE, valueData);
       AddVariable(value);

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/ModelAnalyzerExporter.cs

@@ -120 +120 @@
 
     public static string ExportToHL2(this Constant constant, IFunctionTree tree) {
-      double value = ((ConstrainedDoubleData)tree.GetLocalVariable(Constant.VALUE).Value).Data;
+      double value = ((DoubleData)tree.GetLocalVariable(Constant.VALUE).Value).Data;
       return "[T]Constant(" + value.ToString("r") + ";0;0)";
     }
@@ -129 +129 @@
 
     public static string ExportToHL2(this Differential differential, IFunctionTree tree) {
-      double weight = ((ConstrainedDoubleData)tree.GetLocalVariable(Differential.WEIGHT).Value).Data;
+      double weight = ((DoubleData)tree.GetLocalVariable(Differential.WEIGHT).Value).Data;
       double index = ((ConstrainedIntData)tree.GetLocalVariable(Differential.INDEX).Value).Data;
       double offset = ((ConstrainedIntData)tree.GetLocalVariable(Differential.OFFSET).Value).Data;
@@ -177 +177 @@
 
     public static string ExportToHL2(this Variable variable, IFunctionTree tree) {
-      double weight = ((ConstrainedDoubleData)tree.GetLocalVariable(Variable.WEIGHT).Value).Data;
+      double weight = ((DoubleData)tree.GetLocalVariable(Variable.WEIGHT).Value).Data;
       double index = ((ConstrainedIntData)tree.GetLocalVariable(Variable.INDEX).Value).Data;
       double offset = ((ConstrainedIntData)tree.GetLocalVariable(Variable.OFFSET).Value).Data;

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Variable.cs

@@ -64 +64 @@
       GetVariableInfo(MANIPULATION).Local = false;
 
-      ConstrainedDoubleData weight = new ConstrainedDoubleData();
-      // initialize a totally arbitrary range for the weight = [-1.0, 1.0]
-      weight.AddConstraint(new DoubleBoundedConstraint(-1.0, 1.0));
+      DoubleData weight = new DoubleData();
       AddVariable(new HeuristicLab.Core.Variable(WEIGHT, weight));