Changeset 3044 for trunk/sources
- Timestamp:
- 03/15/10 18:00:07 (15 years ago)
- Location:
- trunk/sources
- Files:
-
- 18 added
- 8 deleted
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Algorithms.TS/3.3/HeuristicLab.Algorithms.TS-3.3.csproj
r2997 r3044 89 89 <SubType>Code</SubType> 90 90 </Compile> 91 <Compile Include="TSOperator.cs"> 91 <Compile Include="TS.cs" /> 92 <Compile Include="TSMainLoop.cs"> 92 93 <SubType>Code</SubType> 93 94 </Compile> … … 118 119 <Name>HeuristicLab.Operators-3.3</Name> 119 120 </ProjectReference> 121 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 122 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 123 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 124 </ProjectReference> 120 125 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 121 126 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> … … 133 138 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> 134 139 <Name>HeuristicLab.PluginInfrastructure</Name> 140 </ProjectReference> 141 <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj"> 142 <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project> 143 <Name>HeuristicLab.Random-3.3</Name> 135 144 </ProjectReference> 136 145 <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj"> -
trunk/sources/HeuristicLab.Algorithms.TS/3.3/TabuSelector.cs
r3017 r3044 36 36 /// For different aspiration criteria a new operator should be implemented. 37 37 /// </remarks> 38 [Item("TabuSelector", "An operator that selects the best move that is either not tabu or satisfies the aspiration criterion. It expects the move subscopes to be sorted .")]38 [Item("TabuSelector", "An operator that selects the best move that is either not tabu or satisfies the aspiration criterion. It expects the move subscopes to be sorted by the qualities of the moves (the best move is first).")] 39 39 [StorableClass] 40 40 public class TabuSelector : Selector { … … 90 90 /// Implements the tabu selection with the default aspiration criteria (choose a tabu move when it is better than the best so far). 91 91 /// </summary> 92 /// <exception cref="InvalidOperationException">Thrown when the neighborhood contained too little moves which are not tabu.</exception> 92 93 /// <param name="scopes">The scopes from which to select.</param> 93 94 /// <returns>The selected scopes.</returns> -
trunk/sources/HeuristicLab.Encodings.Permutation/3.3/HeuristicLab.Encodings.Permutation-3.3.csproj
r2997 r3044 96 96 <Compile Include="Interfaces\IPermutationCrossover.cs" /> 97 97 <Compile Include="Interfaces\IPermutationManipulator.cs" /> 98 <Compile Include="Interfaces\IPermutationMove Generator.cs" />98 <Compile Include="Interfaces\IPermutationMoveOperator.cs" /> 99 99 <Compile Include="Interfaces\IPermutationOperator.cs" /> 100 <Compile Include="Interfaces\ITwoOptPermutationMoveOperator.cs" /> 100 101 <Compile Include="Manipulators\InsertionManipulator.cs" /> 101 102 <Compile Include="Manipulators\InversionManipulator.cs" /> … … 105 106 <Compile Include="Manipulators\TranslocationInversionManipulator.cs" /> 106 107 <Compile Include="Manipulators\TranslocationManipulator.cs" /> 107 <Compile Include="Moves\ ExhaustiveTwoOptMoveGenerator.cs">108 <Compile Include="Moves\TwoOpt\ExhaustiveTwoOptMoveGenerator.cs"> 108 109 <SubType>Code</SubType> 109 110 </Compile> … … 111 112 <SubType>Code</SubType> 112 113 </Compile> 113 <Compile Include="Moves\TwoOptMove.cs"> 114 <Compile Include="Moves\TwoOpt\StochasticTwoOptMoveGenerator.cs" /> 115 <Compile Include="Moves\TwoOpt\TwoOptMove.cs"> 114 116 <SubType>Code</SubType> 115 117 </Compile> 116 <Compile Include="Moves\TwoOptMoveMaker.cs"> 118 <Compile Include="Moves\TwoOpt\TwoOptMoveGenerator.cs" /> 119 <Compile Include="Moves\TwoOpt\TwoOptMoveMaker.cs"> 117 120 <SubType>Code</SubType> 118 121 </Compile> 119 <Compile Include="Moves\TwoOpt MoveTabuAttribute.cs">122 <Compile Include="Moves\TwoOpt\TwoOptMoveTabuAttribute.cs"> 120 123 <SubType>Code</SubType> 121 124 </Compile> 122 <Compile Include="Moves\TwoOpt MoveTabuEvaluator.cs">125 <Compile Include="Moves\TwoOpt\TwoOptMoveTabuEvaluator.cs"> 123 126 <SubType>Code</SubType> 124 127 </Compile> 125 <Compile Include="Moves\TwoOpt MoveTabuMaker.cs">128 <Compile Include="Moves\TwoOpt\TwoOptMoveTabuMaker.cs"> 126 129 <SubType>Code</SubType> 127 130 </Compile> -
trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs
r3023 r3044 50 50 get { return CurrentScopeParameter.ActualValue; } 51 51 } 52 public IntData NumberOfSolutions { 53 get { return NumberOfSolutionsParameter.Value; } 54 set { NumberOfSolutionsParameter.Value = value; } 55 } 52 56 53 57 public SolutionsCreator() -
trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj
r2997 r3044 86 86 <None Include="HeuristicLabOptimizationPlugin.cs.frame" /> 87 87 <Compile Include="Algorithm.cs" /> 88 <Compile Include="Interfaces\IMoveOperator.cs" /> 89 <Compile Include="Interfaces\ISingleObjectiveMoveEvaluator.cs" /> 88 90 <Compile Include="Interfaces\IMoveGenerator.cs" /> 91 <Compile Include="Interfaces\IMoveMaker.cs" /> 89 92 <Compile Include="Interfaces\IMultiObjectiveSelector.cs" /> 90 93 <Compile Include="Interfaces\ISingleObjectiveSelector.cs" /> … … 102 105 <Compile Include="Interfaces\ISolutionCreator.cs" /> 103 106 <Compile Include="Interfaces\IStochasticOperator.cs" /> 107 <Compile Include="Interfaces\ITabuMoveEvaluator.cs" /> 108 <Compile Include="Interfaces\ITabuMoveMaker.cs" /> 104 109 <Compile Include="UserDefinedAlgorithm.cs" /> 105 110 <Compile Include="EngineAlgorithm.cs" /> -
trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IMoveGenerator.cs
r2997 r3044 21 21 22 22 using HeuristicLab.Core; 23 using HeuristicLab.Parameters; 23 24 24 25 namespace HeuristicLab.Optimization { … … 26 27 /// An interface which represents an operator for generating moves. 27 28 /// </summary> 28 public interface IMoveGenerator : IOperator { } 29 public interface IMoveGenerator : IOperator { 30 } 29 31 } -
trunk/sources/HeuristicLab.Problems.TSP/3.3/MoveEvaluators/TwoOptMoveTSPEvaluator.cs
r3017 r3044 79 79 moveQuality += CalculateDistance(coordinates[edge1target, 0], coordinates[edge1target, 1], 80 80 coordinates[edge2target, 0], coordinates[edge2target, 1]); 81 MoveQualityParameter.ActualValue = new DoubleData(moveQuality); 81 if (MoveQualityParameter.ActualValue == null) MoveQualityParameter.ActualValue = new DoubleData(moveQuality); 82 else MoveQualityParameter.ActualValue.Value = moveQuality; 82 83 return base.Apply(); 83 84 }
Note: See TracChangeset
for help on using the changeset viewer.