Changeset 17981

Timestamp:

05/11/21 11:48:17 (4 years ago)

Author:

gkronber

Message:

#3073: fixed bugs in ShapeConstrainedRegressionProblemData

File:

• trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ShapeConstrainedRegressionProblemData.cs (modified) (5 diffs)

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/ShapeConstrainedRegressionProblemData.cs

@@ -35 +35 @@
     protected const string ShapeConstraintsParameterName = "ShapeConstraints";
 
+    #region default data
     private static double[,] sigmoid = new double[,] {
       {1.00, 0.09, 0.01390952},
@@ -90 +91 @@
     static ShapeConstrainedRegressionProblemData() {
       defaultDataset = new Dataset(new string[] { "x", "y", "y_noise" }, sigmoid) {
-        Name = "Sigmoid function to show shape-constrained symbolic regression.",
+        Name = "Sigmoid function for shape-constrained symbolic regression.",
         Description = "f(x) = 1 + tanh(x - 2.5)"
       };
@@ -110 +111 @@
       problemData.Parameters.Add(new FixedValueParameter<Dataset>(DatasetParameterName, "", new Dataset()));
       problemData.Parameters.Add(new FixedValueParameter<ReadOnlyCheckedItemList<StringValue>>(InputVariablesParameterName, ""));
-      problemData.Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
-      problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly()));
+      problemData.Parameters.Add(new FixedValueParameter<IntRange>(TrainingPartitionParameterName, "", (IntRange)new IntRange(0, 20).AsReadOnly()));
+      problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(20, 40).AsReadOnly()));
       problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>()));
       problemData.Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, "", new IntervalCollection()));
@@ -117 +118 @@
       emptyProblemData = problemData;
     }
+    #endregion
 
     public IFixedValueParameter<ShapeConstraints> ShapeConstraintParameter => (IFixedValueParameter<ShapeConstraints>)Parameters[ShapeConstraintsParameterName];
@@ -142 +144 @@
     public ShapeConstrainedRegressionProblemData(IRegressionProblemData regressionProblemData)
       : this(regressionProblemData.Dataset, regressionProblemData.AllowedInputVariables, regressionProblemData.TargetVariable,
-          regressionProblemData.TrainingPartition, regressionProblemData.TestPartition, regressionProblemData.Transformations, null, regressionProblemData.VariableRanges) {
+          regressionProblemData.TrainingPartition, regressionProblemData.TestPartition, regressionProblemData.Transformations,
+          (regressionProblemData is ShapeConstrainedRegressionProblemData scRegProblemData) ? scRegProblemData.ShapeConstraints : null, 
+          regressionProblemData.VariableRanges) {
     }