Changeset 15343 for branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/EfficientGlobalOptimizationAlgorithm.cs
- Timestamp:
- 08/29/17 11:28:16 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/EfficientGlobalOptimization/HeuristicLab.Algorithms.EGO/EfficientGlobalOptimizationAlgorithm.cs
r15338 r15343 96 96 public IFixedValueParameter<FileValue> InitialSamplesParameter => Parameters[InitialSamplesParameterName] as IFixedValueParameter<FileValue>; 97 97 public IValueParameter<RealVector> BaselineVectorParameter => Parameters[BaselineVectorParameterName] as IValueParameter<RealVector>; 98 public IConstrainedValueParameter<IInitialSampling > InitialSamplingPlanParameter => Parameters[InitialSamplingPlanParamterName] as IConstrainedValueParameter<IInitialSampling>;98 public IConstrainedValueParameter<IInitialSampling<RealVector>> InitialSamplingPlanParameter => Parameters[InitialSamplingPlanParamterName] as IConstrainedValueParameter<IInitialSampling<RealVector>>; 99 99 #endregion 100 100 … … 116 116 private bool RemoveDuplicates => RemoveDuplicatesParameter.Value.Value; 117 117 private RealVector BaselineVector => BaselineVectorParameter.Value; 118 private IInitialSampling InitialSamplingPlan => InitialSamplingPlanParameter.Value;118 private IInitialSampling<RealVector> InitialSamplingPlan => InitialSamplingPlanParameter.Value; 119 119 #endregion 120 120 … … 200 200 var criteria = new ItemSet<IInfillCriterion> { new ExpectedImprovement(), new AugmentedExpectedImprovement(), new ExpectedQuality(), eqi, new MinimalQuantileCriterium(), new PluginExpectedImprovement() }; 201 201 Parameters.Add(new ConstrainedValueParameter<IInfillCriterion>(InfillCriterionParameterName, "Decision what value should decide the next sample", criteria, criteria.First())); 202 var intialSamplingPlans = new ItemSet<IInitialSampling > { new UniformRandomSampling(), new LatinHyperCubeDesignCreator() };203 Parameters.Add(new ConstrainedValueParameter<IInitialSampling >(InitialSamplingPlanParamterName, "Determies the initial samples from which the first model can be built.", intialSamplingPlans, intialSamplingPlans.First()));202 var intialSamplingPlans = new ItemSet<IInitialSampling<RealVector>> { new UniformRandomSampling(), new LatinHyperCubeDesignCreator() }; 203 Parameters.Add(new ConstrainedValueParameter<IInitialSampling<RealVector>>(InitialSamplingPlanParamterName, "Determies the initial samples from which the first model can be built.", intialSamplingPlans, intialSamplingPlans.First())); 204 204 SetInfillProblem(); 205 205 RegisterEventhandlers(); … … 246 246 Samples.Add(Evaluate(t)); 247 247 cancellationToken.ThrowIfCancellationRequested(); 248 } finally { 248 } 249 finally { 249 250 Analyze(); 250 251 } … … 264 265 } 265 266 266 } finally { 267 } 268 finally { 267 269 Analyze(); 268 270 } … … 363 365 solution = sol; 364 366 } 365 } catch (ArgumentException) { } 367 } 368 catch (ArgumentException) { } 366 369 } 367 370
Note: See TracChangeset
for help on using the changeset viewer.