- Timestamp:
- 06/22/20 03:45:41 (4 years ago)
- Location:
- branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3
- Files:
-
- 3 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj
r16876 r17620 146 146 <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterManipulator.cs" /> 147 147 <Compile Include="Interfaces\IIntegerVectorStdDevStrategyParameterOperator.cs" /> 148 <Compile Include="Interfaces\IIntegerVectorLocalImprovementOperator.cs" /> 149 <Compile Include="Interfaces\IIntegerVectorSolutionOperator.cs" /> 150 <Compile Include="Interfaces\IIntegerVectorSolutionsOperator.cs" /> 148 151 <Compile Include="Manipulators\UniformSomePositionsManipulator.cs" /> 149 152 <Compile Include="Manipulators\RoundedNormalAllPositionsManipulator.cs" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorEncoding.cs
r17614 r17620 120 120 typeof (IIntegerVectorStdDevStrategyParameterOperator), 121 121 typeof (IIntegerVectorMultiNeighborhoodShakingOperator), 122 typeof (IIntegerVectorLocalImprovementOperator), 123 typeof (IIntegerVectorSolutionOperator), 124 typeof (IIntegerVectorSolutionsOperator) 122 125 }; 123 126 } … … 142 145 ConfigureShakingOperators(operators.OfType<IIntegerVectorMultiNeighborhoodShakingOperator>()); 143 146 ConfigureStrategyVectorOperator(operators.OfType<IIntegerVectorStdDevStrategyParameterOperator>()); 147 ConfigureLocalImprovementOperators(operators.OfType<IIntegerVectorLocalImprovementOperator>()); 148 ConfigureSolutionOperators(operators.OfType<IIntegerVectorSolutionOperator>()); 149 ConfigureSolutionsOperators(operators.OfType<IIntegerVectorSolutionsOperator>()); 144 150 } 145 151 … … 217 223 } 218 224 } 225 private void ConfigureLocalImprovementOperators(IEnumerable<IIntegerVectorLocalImprovementOperator> localImprovementOperators) { 226 // IIntegerVectorLocalImprovementOperator does not contain additional parameters (already contained in IIntegerVectorSolutionOperator) 227 } 228 private void ConfigureSolutionOperators(IEnumerable<IIntegerVectorSolutionOperator> solutionOperators) { 229 foreach (var solutionOperator in solutionOperators) { 230 solutionOperator.IntegerVectorParameter.ActualName = Name; 231 } 232 } 233 private void ConfigureSolutionsOperators(IEnumerable<IIntegerVectorSolutionsOperator> solutionsOperators) { 234 foreach (var solutionsOperator in solutionsOperators) { 235 solutionsOperator.IntegerVectorsParameter.ActualName = Name; 236 } 237 } 219 238 #endregion 220 239 -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorMultiObjectiveProblem.cs
r17612 r17620 86 86 } 87 87 88 protected override void OnEncodingChanged() {89 base. OnEncodingChanged();88 protected override void ParameterizeOperators() { 89 base.ParameterizeOperators(); 90 90 Parameterize(); 91 91 } -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorProblem.cs
r17612 r17620 72 72 73 73 Operators.Add(new HammingSimilarityCalculator()); 74 // TODO: These should be added in the SingleObjectiveProblem base class (if they were accessible from there) 74 75 Operators.Add(new QualitySimilarityCalculator()); 75 76 Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>())); … … 86 87 } 87 88 88 protected override void OnEncodingChanged() {89 base. OnEncodingChanged();89 protected override void ParameterizeOperators() { 90 base.ParameterizeOperators(); 90 91 Parameterize(); 91 92 } 92 93 93 94 private void Parameterize() { 95 // TODO: this is done in base class as well (but operators are added at this level of the hierarchy) 94 96 foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) { 95 97 similarityCalculator.SolutionVariableName = Encoding.Name; -
branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Interfaces/IIntegerVectorMultiNeighborhoodShakingOperator.cs
r17226 r17620 20 20 #endregion 21 21 22 using HEAL.Attic; 22 23 using HeuristicLab.Core; 23 using H EAL.Attic;24 using HeuristicLab.Optimization; 24 25 25 26 namespace HeuristicLab.Encodings.IntegerVectorEncoding { 26 27 [StorableType("2b21442c-735f-4df3-a163-4e3147cd11a5")] 27 public interface IIntegerVectorMultiNeighborhoodShakingOperator : IIntegerVectorOperator {28 public interface IIntegerVectorMultiNeighborhoodShakingOperator : IIntegerVectorOperator, IMultiNeighborhoodShakingOperator { 28 29 ILookupParameter<IntegerVector> IntegerVectorParameter { get; } 29 30 }
Note: See TracChangeset
for help on using the changeset viewer.