Changeset 7944


Ignore:
Timestamp:
05/31/12 16:51:58 (9 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:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/DataAnalysisExperimentWizard.cs

    r7912 r7944  
    1515      wizard.AddPage(new WizardPage());
    1616      wizard.AddPage(new MediumAnalysisPage(context));
    17       wizard.AddPage(new ExperimentViewPage(context));
     17      wizard.AddPage(new ResultPage(context));
     18      //wizard.AddPage(new ExperimentViewPage(context));
    1819
    1920    }
  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard.csproj

    r7939 r7944  
    4343    </Reference>
    4444    <Reference Include="HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     45    <Reference Include="HeuristicLab.Clients.Hive-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     46    <Reference Include="HeuristicLab.Clients.Hive.JobManager-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    4547    <Reference Include="HeuristicLab.Collections-3.3">
    4648      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     
    6567    </Reference>
    6668    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     69    <Reference Include="HeuristicLab.ExperimentGeneration.DataAnalysis.Wizard-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     70    <Reference Include="HeuristicLab.Hive-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    6771    <Reference Include="HeuristicLab.MainForm-3.3">
    6872      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     
    107111    <Reference Include="System.Core" />
    108112    <Reference Include="System.Drawing" />
     113    <Reference Include="System.Runtime.Serialization" />
    109114    <Reference Include="System.Windows.Forms" />
    110115    <Reference Include="System.Xml.Linq" />
     
    144149    </Compile>
    145150    <Compile Include="Properties\AssemblyInfo.cs" />
     151    <Compile Include="ResultPage.cs">
     152      <SubType>UserControl</SubType>
     153    </Compile>
     154    <Compile Include="ResultPage.Designer.cs">
     155      <DependentUpon>ResultPage.cs</DependentUpon>
     156    </Compile>
    146157    <Compile Include="SelectAnalysisPage.cs">
    147158      <SubType>UserControl</SubType>
     
    168179    <EmbeddedResource Include="ProblemDataViewPage.resx">
    169180      <DependentUpon>ProblemDataViewPage.cs</DependentUpon>
     181    </EmbeddedResource>
     182    <EmbeddedResource Include="ResultPage.resx">
     183      <DependentUpon>ResultPage.cs</DependentUpon>
    170184    </EmbeddedResource>
    171185    <EmbeddedResource Include="SelectAnalysisPage.resx">
  • branches/DataAnalysisService/HeuristicLab.ExperimentGeneration.DataAnalysis.ExperimentWizard/3.3/MediumAnalysisPage.cs

    r7939 r7944  
    4040
    4141      // SVR Experiment -------------------------------------------------------
    42       SupportVectorRegression svr = new SupportVectorRegression();
    43       svr.Problem = (IRegressionProblem)problem;
    44       ParameterConfigurationTree vc = new ParameterConfigurationTree(svr, problem);
     42      //SupportVectorRegression svr = new SupportVectorRegression();
     43      //svr.Problem = (IRegressionProblem)problem;
     44      //ParameterConfigurationTree vc = new ParameterConfigurationTree(svr, problem);
    4545
    46       var nuRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.9), new DoubleValue(0.1));
    47       SetParameterRangeContraint(vc, "Nu", nuRange);
     46      //var nuRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.9), new DoubleValue(0.1));
     47      //SetParameterRangeContraint(vc, "Nu", nuRange);
    4848
    49       var costRange = new DoubleValueFactorRange(new DoubleValue(0.03125), new DoubleValue(32768), new DoubleValue(4));
    50       SetParameterRangeContraint(vc, "Cost", costRange);
     49      //var costRange = new DoubleValueFactorRange(new DoubleValue(0.03125), new DoubleValue(32768), new DoubleValue(4));
     50      //SetParameterRangeContraint(vc, "Cost", costRange);
    5151
    52       var gammaRange = new DoubleValueFactorRange(new DoubleValue(6.10352E-05), new DoubleValue(64), new DoubleValue(4));
    53       SetParameterRangeContraint(vc, "Gamma", gammaRange);
    54       worker.ReportProgress(5);
    55       Experiment svrExperiment = vc.GenerateExperiment(svr);
     52      //var gammaRange = new DoubleValueFactorRange(new DoubleValue(6.10352E-05), new DoubleValue(64), new DoubleValue(4));
     53      //SetParameterRangeContraint(vc, "Gamma", gammaRange);
     54      //worker.ReportProgress(5);
     55      //Experiment svrExperiment = vc.GenerateExperiment(svr);
    5656      // ======================================================================
    5757      worker.ReportProgress(20);
    5858
    5959      // RF Experiment --------------------------------------------------------
    60       RandomForestRegression rfr = new RandomForestRegression();
    61       rfr.Problem = (IRegressionProblem)problem;
    62       ParameterConfigurationTree rfConfig = new ParameterConfigurationTree(rfr, problem);
    63       var rRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.7), new DoubleValue(0.1));
    64       SetParameterRangeContraint(rfConfig, "R", rRange);
    65       var treeRange = new IntValueRange(new IntValue(250), new IntValue(250), new IntValue(250));
    66       SetParameterRangeContraint(rfConfig, "Number of trees", treeRange);
    67       Experiment rfrExperiment = rfConfig.GenerateExperiment(rfr);
     60      //RandomForestRegression rfr = new RandomForestRegression();
     61      //rfr.Problem = (IRegressionProblem)problem;
     62      //ParameterConfigurationTree rfConfig = new ParameterConfigurationTree(rfr, problem);
     63      //var rRange = new DoubleValueRange(new DoubleValue(0.1), new DoubleValue(0.7), new DoubleValue(0.1));
     64      //SetParameterRangeContraint(rfConfig, "R", rRange);
     65      //var treeRange = new IntValueRange(new IntValue(250), new IntValue(250), new IntValue(250));
     66      //SetParameterRangeContraint(rfConfig, "Number of trees", treeRange);
     67      //Experiment rfrExperiment = rfConfig.GenerateExperiment(rfr);
    6868      // ======================================================================
    6969      worker.ReportProgress(40);
    7070      // NN Experiment --------------------------------------------------------
    71       NeuralNetworkRegression nnr = new NeuralNetworkRegression();
    72       nnr.Problem = (IRegressionProblem)problem;
    73       ParameterConfigurationTree nnrConfig = new ParameterConfigurationTree(nnr, problem);
    74       var decayRange = new DoubleValueFactorRange(new DoubleValue(0.001), new DoubleValue(100), new DoubleValue(10));
    75       SetParameterRangeContraint(nnrConfig, "Decay", decayRange);
    76       var nodesRange = new IntValueFactorRange(new IntValue(1), new IntValue(100), new IntValue(3));
    77       SetParameterRangeContraint(nnrConfig, "NodesInFirstHiddenLayer", nodesRange);
    78       Experiment nnrExperiment = nnrConfig.GenerateExperiment(nnr);
     71      //NeuralNetworkRegression nnr = new NeuralNetworkRegression();
     72      //nnr.Problem = (IRegressionProblem)problem;
     73      //ParameterConfigurationTree nnrConfig = new ParameterConfigurationTree(nnr, problem);
     74      //var decayRange = new DoubleValueFactorRange(new DoubleValue(0.001), new DoubleValue(100), new DoubleValue(10));
     75      //SetParameterRangeContraint(nnrConfig, "Decay", decayRange);
     76      //var nodesRange = new IntValueFactorRange(new IntValue(1), new IntValue(100), new IntValue(3));
     77      //SetParameterRangeContraint(nnrConfig, "NodesInFirstHiddenLayer", nodesRange);
     78      //Experiment nnrExperiment = nnrConfig.GenerateExperiment(nnr);
    7979      // ======================================================================
    8080      worker.ReportProgress(60);
     
    126126
    127127      Experiment experiment = new Experiment("Data Analysis Experiment");
    128       experiment.Optimizers.Add(svrExperiment);
    129       experiment.Optimizers.Add(rfrExperiment);
    130       experiment.Optimizers.Add(nnrExperiment);
     128      //experiment.Optimizers.Add(svrExperiment);
     129      //experiment.Optimizers.Add(rfrExperiment);
     130      //experiment.Optimizers.Add(nnrExperiment);
    131131      experiment.Optimizers.Add(gpExperiment);
    132132
Note: See TracChangeset for help on using the changeset viewer.