Changeset 15675

Timestamp:

01/30/18 15:06:28 (6 years ago)

Author:

fholzing

Message:

#2883: Changed from Boolean to Enum

Location:

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs (modified) (7 diffs)
• GradientBoostedTrees/ModelStorage.cs (added)
• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• Plugin.cs (modified) (1 diff)

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesAlgorithm.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Threading;
+using HeuristicLab.Algorithms.DataAnalysis.GradientBoostedTrees;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -52 +53 @@
 
     #region ParameterProperties
-    public IFixedValueParameter<IntValue> IterationsParameter {
+    public IFixedValueParameter<IntValue> IterationsParameter
+    {
       get { return (IFixedValueParameter<IntValue>)Parameters[IterationsParameterName]; }
     }
-    public IFixedValueParameter<IntValue> MaxSizeParameter {
+    public IFixedValueParameter<IntValue> MaxSizeParameter
+    {
       get { return (IFixedValueParameter<IntValue>)Parameters[MaxSizeParameterName]; }
     }
-    public IFixedValueParameter<DoubleValue> NuParameter {
+    public IFixedValueParameter<DoubleValue> NuParameter
+    {
       get { return (IFixedValueParameter<DoubleValue>)Parameters[NuParameterName]; }
     }
-    public IFixedValueParameter<DoubleValue> RParameter {
+    public IFixedValueParameter<DoubleValue> RParameter
+    {
       get { return (IFixedValueParameter<DoubleValue>)Parameters[RParameterName]; }
     }
-    public IFixedValueParameter<DoubleValue> MParameter {
+    public IFixedValueParameter<DoubleValue> MParameter
+    {
       get { return (IFixedValueParameter<DoubleValue>)Parameters[MParameterName]; }
     }
-    public IFixedValueParameter<IntValue> SeedParameter {
+    public IFixedValueParameter<IntValue> SeedParameter
+    {
       get { return (IFixedValueParameter<IntValue>)Parameters[SeedParameterName]; }
     }
-    public FixedValueParameter<BoolValue> SetSeedRandomlyParameter {
+    public FixedValueParameter<BoolValue> SetSeedRandomlyParameter
+    {
       get { return (FixedValueParameter<BoolValue>)Parameters[SetSeedRandomlyParameterName]; }
     }
-    public IConstrainedValueParameter<ILossFunction> LossFunctionParameter {
+    public IConstrainedValueParameter<ILossFunction> LossFunctionParameter
+    {
       get { return (IConstrainedValueParameter<ILossFunction>)Parameters[LossFunctionParameterName]; }
     }
-    public IFixedValueParameter<IntValue> UpdateIntervalParameter {
+    public IFixedValueParameter<IntValue> UpdateIntervalParameter
+    {
       get { return (IFixedValueParameter<IntValue>)Parameters[UpdateIntervalParameterName]; }
     }
-    public IFixedValueParameter<BoolValue> CreateSolutionParameter {
-      get { return (IFixedValueParameter<BoolValue>)Parameters[CreateSolutionParameterName]; }
+    private IFixedValueParameter<EnumValue<ModelStorage>> CreateSolutionParameter
+    {
+      get { return (IFixedValueParameter<EnumValue<ModelStorage>>)Parameters[CreateSolutionParameterName]; }
     }
     #endregion
 
     #region Properties
-    public int Iterations {
+    public int Iterations
+    {
       get { return IterationsParameter.Value.Value; }
       set { IterationsParameter.Value.Value = value; }
     }
-    public int Seed {
+    public int Seed
+    {
       get { return SeedParameter.Value.Value; }
       set { SeedParameter.Value.Value = value; }
     }
-    public bool SetSeedRandomly {
+    public bool SetSeedRandomly
+    {
       get { return SetSeedRandomlyParameter.Value.Value; }
       set { SetSeedRandomlyParameter.Value.Value = value; }
     }
-    public int MaxSize {
+    public int MaxSize
+    {
       get { return MaxSizeParameter.Value.Value; }
       set { MaxSizeParameter.Value.Value = value; }
     }
-    public double Nu {
+    public double Nu
+    {
       get { return NuParameter.Value.Value; }
       set { NuParameter.Value.Value = value; }
     }
-    public double R {
+    public double R
+    {
       get { return RParameter.Value.Value; }
       set { RParameter.Value.Value = value; }
     }
-    public double M {
+    public double M
+    {
       get { return MParameter.Value.Value; }
       set { MParameter.Value.Value = value; }
     }
-    public bool CreateSolution {
+    public ModelStorage CreateSolution
+    {
       get { return CreateSolutionParameter.Value.Value; }
       set { CreateSolutionParameter.Value.Value = value; }
@@ -120 +139 @@
 
     #region ResultsProperties
-    private double ResultsBestQuality {
+    private double ResultsBestQuality
+    {
       get { return ((DoubleValue)Results["Best Quality"].Value).Value; }
       set { ((DoubleValue)Results["Best Quality"].Value).Value = value; }
     }
-    private DataTable ResultsQualities {
+    private DataTable ResultsQualities
+    {
       get { return ((DataTable)Results["Qualities"].Value); }
     }
@@ -152 +173 @@
       Parameters.Add(new FixedValueParameter<IntValue>(UpdateIntervalParameterName, "", new IntValue(100)));
       Parameters[UpdateIntervalParameterName].Hidden = true;
-      Parameters.Add(new FixedValueParameter<BoolValue>(CreateSolutionParameterName, "Flag that indicates if a solution should be produced at the end of the run", new BoolValue(true)));
+      Parameters.Add(new FixedValueParameter<EnumValue<ModelStorage>>(CreateSolutionParameterName, "Flag that indicates what kind of solution should be produced at the end of the run", new EnumValue<ModelStorage>(ModelStorage.Parameter)));
       Parameters[CreateSolutionParameterName].Hidden = true;
 
@@ -164 +185 @@
       // BackwardsCompatibility3.4
       #region Backwards compatible code, remove with 3.5
+
+      #region LossFunction
       // parameter type has been changed
       var lossFunctionParam = Parameters[LossFunctionParameterName] as ConstrainedValueParameter<StringValue>;
@@ -182 +205 @@
       }
       #endregion
+
+      #region CreateSolution
+      // parameter type has been changed
+      var createSolutionParam = Parameters[CreateSolutionParameterName] as FixedValueParameter<BoolValue>;
+      if (createSolutionParam != null) {
+        Parameters.Remove(CreateSolutionParameterName);
+
+        ModelStorage value = createSolutionParam.Value.Value ? ModelStorage.Parameter : ModelStorage.Quality;
+        Parameters.Add(new FixedValueParameter<EnumValue<ModelStorage>>(CreateSolutionParameterName, "Flag that indicates what kind of solution should be produced at the end of the run", new EnumValue<ModelStorage>(value)));
+        Parameters[CreateSolutionParameterName].Hidden = true;
+      }
+      #endregion
+      #endregion
     }
 
@@ -248 +284 @@
 
       // produce solution 
-      if (CreateSolution) {
+      if (CreateSolution == ModelStorage.Parameter) {
         var model = state.GetModel();
 

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -308 +308 @@
     <Compile Include="GradientBoostedTrees\LossFunctions\SquaredErrorLoss.cs" />
     <Compile Include="GradientBoostedTrees\GradientBoostedTreesSolution.cs" />
+    <Compile Include="GradientBoostedTrees\ModelStorage.cs" />
     <Compile Include="GradientBoostedTrees\RegressionTreeBuilder.cs" />
     <Compile Include="GradientBoostedTrees\RegressionTreeModel.cs" />

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Algorithms.DataAnalysis plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Algorithms.DataAnalysis", "Provides wrappers for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.11.15589")]
+  [Plugin("HeuristicLab.Algorithms.DataAnalysis", "Provides wrappers for data analysis algorithms implemented in external libraries (linear regression, linear discriminant analysis, k-means clustering, support vector classification and regression)", "3.4.11.15670")]
   [PluginFile("HeuristicLab.Algorithms.DataAnalysis-3.4.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]