Context Navigation

Changeset 17520

Timestamp:

04/27/20 16:23:50 (5 years ago)

Author:

mkommend

Message:

#2521: Removed parameter for problemData in IDataAnalysisProblem.

Location:

branches/2521_ProblemRefactoring

Files:

r17382	r17520
104	104
105	105	#region Parameter Properties
106		~~IParameter IDataAnalysisProblem.ProblemDataParameter { get { return ProblemDataParameter; } }~~
107
108	106	public IValueParameter<IRegressionProblemData> ProblemDataParameter {
109	107	get { return (IValueParameter<IRegressionProblemData>)Parameters[ProblemDataParameterName]; }

r16723	r17520
73	73	</PropertyGroup>
74	74	<ItemGroup>
	75	<Reference Include="Microsoft.CSharp" />
75	76	<Reference Include="System" />
76	77	<Reference Include="System.Core" />

-                      r17226
+                      r17520
       preprocessedAlgorithm.Name = preprocessedAlgorithm.Name + "(Preprocessed)";
       preprocessedAlgorithm.Runs.Clear();
       var problem = (IDataAnalysisProblem)preprocessedAlgorithm.Problem;
       problem.ProblemDataParameter.ActualValue = CreateNewProblemData();
+      dynamic problem = preprocessedAlgorithm.Problem;
+      problem.ProblemData = (dynamic) CreateNewProblemData();
       return preprocessedAlgorithm;
+    }
     private IDataAnalysisProblem ExportProblem(IDataAnalysisProblem source) {
       var preprocessedProblem = (IDataAnalysisProblem)source.Clone();
       preprocessedProblem.ProblemDataParameter.ActualValue = CreateNewProblemData();
+      dynamic preprocessedProblem = (IDataAnalysisProblem)source.Clone();
+      preprocessedProblem.ProblemData = (dynamic)CreateNewProblemData();
       return preprocessedProblem;
+    }

r17229	r17520
46	46	}
47	47
	48	protected SymbolicExpressionTreeProblem() : this(new SymbolicExpressionTreeEncoding()) { }
48	49	protected SymbolicExpressionTreeProblem(SymbolicExpressionTreeEncoding encoding)
49	50	: base(encoding) {

-                      r17226
+                      r17520
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {

-                      r17457
+                      r17520
     #region parameter properties
-    IParameter IDataAnalysisProblem.ProblemDataParameter {
-      get { return ProblemDataParameter; }
+    }
     public IValueParameter<T> ProblemDataParameter {
       get { return (IValueParameter<T>)Parameters[ProblemDataParameterName]; }

r16723	r17520
103	103	<Private>False</Private>
104	104	</Reference>
	105	<Reference Include="Microsoft.CSharp" />
105	106	<Reference Include="System" />
106	107	<Reference Include="System.Core">

r17226	r17520
109	109	if (problemData == null) throw new ArgumentNullException("problemData");
110	110
111		~~var problem = algorithm.Problem as IDataAnalysis~~Problem;
112		~~if (problem != null) problem.ProblemDataParameter.ActualValue =~~ problemData;
	111	dynamic problem = algorithm.Problem;
	112	problem.ProblemData = (dynamic) problemData;
113	113	}
114	114	}

-                      r17226
+                      r17520
 using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.Problems.Instances;
 …
     private const string ProblemDataParameterDescription = "The data set, target variable and input variables of the data analysis problem.";
     #region parameter properties
-    IParameter IDataAnalysisProblem.ProblemDataParameter {
-      get { return ProblemDataParameter; }
+    }
     public IValueParameter<T> ProblemDataParameter {
       get { return (IValueParameter<T>)Parameters[ProblemDataParameterName]; }

-                      r17515
+                      r17520
   [StorableType("74e4c570-3881-4bfa-a5bb-2bb71cdee2b3")]
   public interface IDataAnalysisProblem : IProblem {
-    IParameter ProblemDataParameter { get; }
     IDataAnalysisProblemData ProblemData { get; }
     event EventHandler ProblemDataChanged;
 …
   public interface IDataAnalysisProblem<T> : IDataAnalysisProblem
   where T : class, IDataAnalysisProblemData {
     new IValueParameter<T> ProblemDataParameter { get; }
+    IValueParameter<T> ProblemDataParameter { get; }
     new T ProblemData { get; set; }
+  }

r17382	r17520
45	45
46	46	#region Parameter Properties
47		~~IParameter IDataAnalysisProblem.ProblemDataParameter { get { return ProblemDataParameter; } }~~
48
49	47	public IValueParameter<IRegressionProblemData> ProblemDataParameter {
50	48	get { return (IValueParameter<IRegressionProblemData>)Parameters[ProblemDataParameterName]; }

-                      r17226
+                      r17520
     #region parameter properties
-    IParameter IDataAnalysisProblem.ProblemDataParameter {
-      get { return ProblemDataParameter; }
+    }
     public IValueParameter<T> ProblemDataParameter {
       get { return (IValueParameter<T>)Parameters[ProblemDataParameterName]; }

Note: See TracChangeset for help on using the changeset viewer.