Changeset 18006 for branches/3087_Ceres_Integration/HeuristicLab.Optimizer/3.3

Timestamp:

07/13/21 10:55:09 (3 years ago)

Author:

gkronber

Message:

#3087: merged r17784:18004 from trunk to branch to prepare for trunk reintegration (fixed a conflict in CrossValidation.cs)

Location:

branches/3087_Ceres_Integration

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/Documents/GA_Shape_Constrained_Regression.hl (copied) (copied from trunk/HeuristicLab.Optimizer/3.3/Documents/GA_Shape_Constrained_Regression.hl)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Classification_Script.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/Documents/GridSearch_RF_Regression_Script.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimizer/3.3/StartPage.cs (modified) (1 diff)

branches/3087_Ceres_Integration/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

@@ -153 +153 @@
     <EmbeddedResource Include="Documents\PSO_Rastrigin.hl" />
     <EmbeddedResource Include="Documents\OSGP_SymReg.hl" />
+    <EmbeddedResource Include="Documents\GA_Shape_Constrained_Regression.hl" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="ChangeNestingLevelDialog.cs">

branches/3087_Ceres_Integration/HeuristicLab.Optimizer/3.3/StartPage.cs

@@ -130 +130 @@
         };
       groupLookup[standardProblemsGroup] = standardProblems;
-      var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg", "OSGP_SymReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
+      var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg", "OSGP_SymReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR", "GA_Shape_Constrained_Regression" };
       groupLookup[dataAnalysisGroup] = dataAnalysisProblems;
       var scripts = new List<string> { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script",