Changeset 7944

Timestamp:

05/31/12 16:51:58 (12 years ago)

Author:

spimming

Message:

#1807:

• new wizard page to choose what to do with generated experiments
• exclude some experiments from generation for faster debug cycles

Location:

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3

Files:

• DataAnalysisExperimentWizard.cs (modified) (1 diff)
• HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj (modified) (5 diffs)
• MediumAnalysisPage.cs (modified) (2 diffs)
• ResultPage.Designer.cs (added)
• ResultPage.cs (added)

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/DataAnalysisExperimentWizard.cs

@@ -15 +15 @@
       wizard.AddPage(new WizardPage());
       wizard.AddPage(new MediumAnalysisPage(context));
-      wizard.AddPage(new ExperimentViewPage(context));
+      wizard.AddPage(new ResultPage(context));
+      //wizard.AddPage(new ExperimentViewPage(context));
 
     }

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj

@@ -43 +43 @@
     </Reference>
     <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Clients.Hive-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Clients.Hive.JobManager-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
@@ -65 +67 @@
     </Reference>
     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Hive-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.MainForm-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
@@ -107 +111 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
@@ -144 +149 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ResultPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ResultPage.Designer.cs">
+      <DependentUpon>ResultPage.cs</DependentUpon>
+    </Compile>
     <Compile Include="SelectAnalysisPage.cs">
       <SubType>UserControl</SubType>
@@ -168 +179 @@
     <EmbeddedResource Include="ProblemDataViewPage.resx">
       <DependentUpon>ProblemDataViewPage.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ResultPage.resx">
+      <DependentUpon>ResultPage.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SelectAnalysisPage.resx">

branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/MediumAnalysisPage.cs

@@ -40 +40 @@
 
       // SVR Experiment -------------------------------------------------------
-      SupportVectorRegression svr = new SupportVectorRegression();
-      svr.Problem = (IRegressionProblem)problem;
-      ParameterConfigurationTree vc = new ParameterConfigurationTree(svr, problem);
+      //SupportVectorRegression svr = new SupportVectorRegression();
+      //svr.Problem = (IRegressionProblem)problem;
+      //ParameterConfigurationTree vc = new ParameterConfigurationTree(svr, problem);
 
-      var nuRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.9), new DoubleValue(0.1));
-      SetParameterRangeContraint(vc, "Nu", nuRange);
+      //var nuRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.9), new DoubleValue(0.1));
+      //SetParameterRangeContraint(vc, "Nu", nuRange);
 
-      var costRange = new DoubleValueFactorRange(new DoubleValue(0.03125), new DoubleValue(32768), new DoubleValue(4));
-      SetParameterRangeContraint(vc, "Cost", costRange);
+      //var costRange = new DoubleValueFactorRange(new DoubleValue(0.03125), new DoubleValue(32768), new DoubleValue(4));
+      //SetParameterRangeContraint(vc, "Cost", costRange);
 
-      var gammaRange = new DoubleValueFactorRange(new DoubleValue(6.10352E-05), new DoubleValue(64), new DoubleValue(4));
-      SetParameterRangeContraint(vc, "Gamma", gammaRange);
-      worker.ReportProgress(5);
-      Experiment svrExperiment = vc.GenerateExperiment(svr);
+      //var gammaRange = new DoubleValueFactorRange(new DoubleValue(6.10352E-05), new DoubleValue(64), new DoubleValue(4));
+      //SetParameterRangeContraint(vc, "Gamma", gammaRange);
+      //worker.ReportProgress(5);
+      //Experiment svrExperiment = vc.GenerateExperiment(svr);
       // ======================================================================
       worker.ReportProgress(20);
 
       // RF Experiment --------------------------------------------------------
-      RandomForestRegression rfr = new RandomForestRegression();
-      rfr.Problem = (IRegressionProblem)problem;
-      ParameterConfigurationTree rfConfig = new ParameterConfigurationTree(rfr, problem);
-      var rRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.7), new DoubleValue(0.1));
-      SetParameterRangeContraint(rfConfig, "R", rRange);
-      var treeRange = new IntValueRange(new IntValue(250), new IntValue(250), new IntValue(250));
-      SetParameterRangeContraint(rfConfig, "Number of trees", treeRange);
-      Experiment rfrExperiment = rfConfig.GenerateExperiment(rfr);
+      //RandomForestRegression rfr = new RandomForestRegression();
+      //rfr.Problem = (IRegressionProblem)problem;
+      //ParameterConfigurationTree rfConfig = new ParameterConfigurationTree(rfr, problem);
+      //var rRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.7), new DoubleValue(0.1));
+      //SetParameterRangeContraint(rfConfig, "R", rRange);
+      //var treeRange = new IntValueRange(new IntValue(250), new IntValue(250), new IntValue(250));
+      //SetParameterRangeContraint(rfConfig, "Number of trees", treeRange);
+      //Experiment rfrExperiment = rfConfig.GenerateExperiment(rfr);
       // ======================================================================
       worker.ReportProgress(40);
       // NN Experiment --------------------------------------------------------
-      NeuralNetworkRegression nnr = new NeuralNetworkRegression();
-      nnr.Problem = (IRegressionProblem)problem;
-      ParameterConfigurationTree nnrConfig = new ParameterConfigurationTree(nnr, problem);
-      var decayRange = new DoubleValueFactorRange(new DoubleValue(0.001), new DoubleValue(100), new DoubleValue(10));
-      SetParameterRangeContraint(nnrConfig, "Decay", decayRange);
-      var nodesRange = new IntValueFactorRange(new IntValue(1), new IntValue(100), new IntValue(3));
-      SetParameterRangeContraint(nnrConfig, "NodesInFirstHiddenLayer", nodesRange);
-      Experiment nnrExperiment = nnrConfig.GenerateExperiment(nnr);
+      //NeuralNetworkRegression nnr = new NeuralNetworkRegression();
+      //nnr.Problem = (IRegressionProblem)problem;
+      //ParameterConfigurationTree nnrConfig = new ParameterConfigurationTree(nnr, problem);
+      //var decayRange = new DoubleValueFactorRange(new DoubleValue(0.001), new DoubleValue(100), new DoubleValue(10));
+      //SetParameterRangeContraint(nnrConfig, "Decay", decayRange);
+      //var nodesRange = new IntValueFactorRange(new IntValue(1), new IntValue(100), new IntValue(3));
+      //SetParameterRangeContraint(nnrConfig, "NodesInFirstHiddenLayer", nodesRange);
+      //Experiment nnrExperiment = nnrConfig.GenerateExperiment(nnr);
       // ======================================================================
       worker.ReportProgress(60);
@@ -126 +126 @@
 
       Experiment experiment = new Experiment("Data Analysis Experiment");
-      experiment.Optimizers.Add(svrExperiment);
-      experiment.Optimizers.Add(rfrExperiment);
-      experiment.Optimizers.Add(nnrExperiment);
+      //experiment.Optimizers.Add(svrExperiment);
+      //experiment.Optimizers.Add(rfrExperiment);
+      //experiment.Optimizers.Add(nnrExperiment);
       experiment.Optimizers.Add(gpExperiment);