Changeset 15257


Ignore:
Timestamp:
07/16/17 09:43:05 (5 days ago)
Author:
gkronber
Message:

#2802: merged r15235,15246,15247 from trunk to stable

Location:
stable
Files:
7 edited
2 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r15238 r15257  
    5555
    5656    #region Parameter Properties
    57     private ValueParameter<IntValue> SeedParameter {
     57    public IValueParameter<IntValue> SeedParameter {
    5858      get { return (ValueParameter<IntValue>)Parameters["Seed"]; }
    5959    }
    60     private ValueParameter<BoolValue> SetSeedRandomlyParameter {
     60    public IValueParameter<BoolValue> SetSeedRandomlyParameter {
    6161      get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
    6262    }
    63     private ValueParameter<IntValue> PopulationSizeParameter {
     63    public IValueParameter<IntValue> PopulationSizeParameter {
    6464      get { return (ValueParameter<IntValue>)Parameters["PopulationSize"]; }
    6565    }
     
    7070      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
    7171    }
    72     private ValueParameter<PercentValue> MutationProbabilityParameter {
     72    public IValueParameter<PercentValue> MutationProbabilityParameter {
    7373      get { return (ValueParameter<PercentValue>)Parameters["MutationProbability"]; }
    7474    }
     
    7676      get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
    7777    }
    78     private ValueParameter<IntValue> ElitesParameter {
     78    public IValueParameter<IntValue> ElitesParameter {
    7979      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    8080    }
    81     private IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
     81    public IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
    8282      get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
    8383    }
    84     private ValueParameter<IntValue> MaximumGenerationsParameter {
     84    public IValueParameter<IntValue> MaximumGenerationsParameter {
    8585      get { return (ValueParameter<IntValue>)Parameters["MaximumGenerations"]; }
    8686    }
    87     private ValueLookupParameter<DoubleValue> SuccessRatioParameter {
     87    public IValueLookupParameter<DoubleValue> SuccessRatioParameter {
    8888      get { return (ValueLookupParameter<DoubleValue>)Parameters["SuccessRatio"]; }
    8989    }
    90     private ValueLookupParameter<DoubleValue> ComparisonFactorLowerBoundParameter {
     90    public IValueLookupParameter<DoubleValue> ComparisonFactorLowerBoundParameter {
    9191      get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorLowerBound"]; }
    9292    }
    93     private ValueLookupParameter<DoubleValue> ComparisonFactorUpperBoundParameter {
     93    public IValueLookupParameter<DoubleValue> ComparisonFactorUpperBoundParameter {
    9494      get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorUpperBound"]; }
    9595    }
     
    9797      get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
    9898    }
    99     private ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
     99    public IValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
    100100      get { return (ValueLookupParameter<DoubleValue>)Parameters["MaximumSelectionPressure"]; }
    101101    }
    102     private ValueLookupParameter<BoolValue> OffspringSelectionBeforeMutationParameter {
     102    public IValueLookupParameter<BoolValue> OffspringSelectionBeforeMutationParameter {
    103103      get { return (ValueLookupParameter<BoolValue>)Parameters["OffspringSelectionBeforeMutation"]; }
    104104    }
    105     private ValueLookupParameter<IntValue> SelectedParentsParameter {
     105    public IValueLookupParameter<IntValue> SelectedParentsParameter {
    106106      get { return (ValueLookupParameter<IntValue>)Parameters["SelectedParents"]; }
    107107    }
    108     private ValueParameter<MultiAnalyzer> AnalyzerParameter {
     108    public IValueParameter<MultiAnalyzer> AnalyzerParameter {
    109109      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
    110110    }
    111     private ValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
     111    public IValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
    112112      get { return (ValueParameter<IntValue>)Parameters["MaximumEvaluatedSolutions"]; }
    113113    }
    114     private IFixedValueParameter<BoolValue> FillPopulationWithParentsParameter {
     114    public IFixedValueParameter<BoolValue> FillPopulationWithParentsParameter {
    115115      get { return (IFixedValueParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
    116116    }
  • stable/HeuristicLab.Optimizer

  • stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r15038 r15257  
    152152    <EmbeddedResource Include="Documents\OSES_Griewank.hl" />
    153153    <EmbeddedResource Include="Documents\SGP_Robocode.hl" />
     154    <EmbeddedResource Include="Documents\OSGP_SymReg.hl" />
    154155    <None Include="Plugin.cs.frame" />
    155156    <Compile Include="ChangeNestingLevelDialog.cs">
  • stable/HeuristicLab.Optimizer/3.3/StartPage.cs

    r14211 r15257  
    138138        };
    139139      groupLookup[standardProblemsGroup] = standardProblems;
    140       var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
     140      var dataAnalysisProblems = new List<string> { "ALPSGP_SymReg", "SGP_SymbClass", "SGP_SymbReg","OSGP_SymReg", "OSGP_TimeSeries", "GE_SymbReg", "GPR" };
    141141      groupLookup[dataAnalysisGroup] = dataAnalysisProblems;
    142142      var scripts = new List<string> { "GA_QAP_Script", "GUI_Automation_Script", "OSGA_Rastrigin_Script",
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/GPSymbolicRegressionSampleWithOSTest.cs

    r15235 r15257  
    6161
    6262      if (Environment.Is64BitProcess) {
    63         Assert.AreEqual(0.99174959007940156, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8, Environment.NewLine + "Best Qualitiy differs.");
    64         Assert.AreEqual(0.9836083751914968, SamplesUtils.GetDoubleResult(osga, "CurrentAverageQuality"), 1E-8, Environment.NewLine + "Current Average Quality differs.");
    65         Assert.AreEqual(0.98298394717065463, SamplesUtils.GetDoubleResult(osga, "CurrentWorstQuality"), 1E-8, Environment.NewLine + "Current Worst Quality differs.");
    66         Assert.AreEqual(10100, SamplesUtils.GetIntResult(osga, "EvaluatedSolutions"), Environment.NewLine + "Evaluated Solutions differ.");
    67         Assert.AreEqual(0.99174959007940156, bestTrainingSolution.TrainingRSquared, 1E-8, Environment.NewLine + "Best Training Solution Training R² differs.");
    68         Assert.AreEqual(0.896290231994223, bestTrainingSolution.TestRSquared, 1E-8, Environment.NewLine + "Best Training Solution Test R² differs.");
     63        // the following are the result values as produced on builder.heuristiclab.com
     64        // Unfortunately, running the same test on a different machine results in different values
     65        // For x86 environments the results below match but on x64 there is a difference
     66        // We tracked down the ConstantOptimizationEvaluator as a possible cause but have not
     67        // been able to identify the real cause. Presumably, execution on a Xeon and a Core i7 processor
     68        // leads to different results.
     69        Assert.AreEqual(0.90811178793448177, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8, Environment.NewLine + "Best Qualitiy differs.");
     70        Assert.AreEqual(0.87264498853305739, SamplesUtils.GetDoubleResult(osga, "CurrentAverageQuality"), 1E-8, Environment.NewLine + "Current Average Quality differs.");
     71        Assert.AreEqual(0.75425658608938817, SamplesUtils.GetDoubleResult(osga, "CurrentWorstQuality"), 1E-8, Environment.NewLine + "Current Worst Quality differs.");
     72        Assert.AreEqual(8900, SamplesUtils.GetIntResult(osga, "EvaluatedSolutions"), Environment.NewLine + "Evaluated Solutions differ.");
     73        Assert.AreEqual(0.90811178793448177, bestTrainingSolution.TrainingRSquared, 1E-8, Environment.NewLine + "Best Training Solution Training R² differs.");
     74        // Assert.AreEqual(0.896290231994223, bestTrainingSolution.TestRSquared, 1E-8, Environment.NewLine + "Best Training Solution Test R² differs.");
    6975      } else {
    7076        Assert.AreEqual(0.9971536312165723, SamplesUtils.GetDoubleResult(osga, "BestQuality"), 1E-8, Environment.NewLine + "Best Qualitiy differs.");
     
    175181      evaluator.ConstantOptimizationIterations.Value = 5;
    176182      problem.EvaluatorParameter.Value = evaluator;
     183      problem.RelativeNumberOfEvaluatedSamplesParameter.Hidden = true;
     184      problem.SolutionCreatorParameter.Hidden = true;
    177185      #endregion
    178186
     
    201209      osga.SuccessRatioParameter.Hidden = true;
    202210      osga.SelectedParentsParameter.Hidden = true;
     211      osga.ElitesParameter.Hidden = true;
    203212
    204213      #endregion
  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r15217 r15257  
    460460    <Compile Include="HeuristicLab-3.3\Samples\GABppSampleTest.cs" />
    461461    <Compile Include="HeuristicLab-3.3\Samples\GPRobocodeSampleTest.cs" />
     462    <Compile Include="HeuristicLab-3.3\Samples\GPSymbolicRegressionSampleWithOSTest.cs" />
    462463    <Compile Include="HeuristicLab-3.3\Samples\OSESGriewankSampleTest.cs" />
    463464    <Compile Include="HeuristicLab-3.3\Samples\GAGroupingProblemSampleTest.cs" />
Note: See TracChangeset for help on using the changeset viewer.