- Timestamp:
- 10/03/19 17:43:11 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/CompiledProblemDefinition.cs
r17226 r17309 23 23 using System.Collections.Generic; 24 24 using HeuristicLab.Core; 25 using HeuristicLab.Data;26 25 using HeuristicLab.Optimization; 27 26 … … 78 77 79 78 #region ISingleObjectiveProblemDefinition<TEncoding,TEncodedSolution> Members 80 public int Objectives => Maximization. Length;81 public abstract bool[]Maximization { get; }79 public int Objectives => Maximization.Count; 80 public abstract IReadOnlyList<bool> Maximization { get; } 82 81 public abstract IReadOnlyList<double[]> BestKnownFront { get; } 83 82 public abstract double[] ReferencePoint { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs
r17226 r17309 24 24 using HeuristicLab.Common; 25 25 using HeuristicLab.Core; 26 using HeuristicLab.Data;27 26 using HeuristicLab.Optimization; 28 27 … … 52 51 public IReadOnlyList<double[]> BestKnownFront => CompiledProblemDefinition.BestKnownFront; 53 52 public double[] ReferencePoint => CompiledProblemDefinition.ReferencePoint; 54 public bool[]Maximization => CompiledProblemDefinition.Maximization;53 public IReadOnlyList<bool> Maximization => CompiledProblemDefinition.Maximization; 55 54 56 55 -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs
r17226 r17309 94 94 95 95 private void OnProblemDefinitionChanged() { 96 Parameters.Remove("Maximization"); 97 Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()) {Hidden = true}); 96 Maximization = new BoolArray(ProblemDefinition.Maximization); 98 97 Encoding = (TEncoding)ProblemScript.Encoding.Clone(); 99 98 … … 107 106 private void OnProblemScriptNameChanged() { 108 107 Name = ProblemScript.Name; 109 }110 111 public override bool[] Maximization {112 get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : new[] {false}; }113 108 } 114 109 -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/Templates/MultiObjectiveCombinedEncodingProblem_Template.cs
r17225 r17309 16 16 namespace HeuristicLab.Problems.Programmable { 17 17 public class CompiledMultiObjectiveProblemDefinition : CompiledMultiObjectiveProblemDefinition<CombinedEncoding, CombinedSolution> { 18 public override bool[]Maximization { get { return new[] { true, false }; } }18 public override IReadOnlyList<bool> Maximization { get { return new[] { true, false }; } } 19 19 public override double[] ReferencePoint { get { return null; } } 20 20 public override IReadOnlyList<double[]> BestKnownFront { get { return null; } }
Note: See TracChangeset
for help on using the changeset viewer.