Changeset 9363 for branches/OaaS/HeuristicLab.Problems.Knapsack
- Timestamp:
- 04/16/13 13:13:41 (12 years ago)
- Location:
- branches/OaaS
- Files:
-
- 5 edited
- 3 copied
-
. (modified) (2 props)
-
HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (7 diffs)
-
HeuristicLab.Problems.Knapsack/3.3/Improvers (copied) (copied from trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Improvers)
-
HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (4 diffs)
-
HeuristicLab.Problems.Knapsack/3.3/PathRelinkers (copied) (copied from trunk/sources/HeuristicLab.Problems.Knapsack/3.3/PathRelinkers)
-
HeuristicLab.Problems.Knapsack/3.3/Plugin.cs.frame (modified) (2 diffs)
-
HeuristicLab.Problems.Knapsack/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
-
HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators (copied) (copied from trunk/sources/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators)
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj
r6866 r9363 109 109 <ItemGroup> 110 110 <Compile Include="Evaluators\KnapsackEvaluator.cs" /> 111 <Compile Include="Improvers\KnapsackImprovementOperator.cs" /> 111 112 <Compile Include="Interfaces\IKnapsackEvaluator.cs" /> 112 113 <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" /> … … 115 116 <Compile Include="MoveEvaluators\KnapsackMoveEvaluator.cs" /> 116 117 <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" /> 118 <Compile Include="PathRelinkers\KnapsackPathRelinker.cs" /> 119 <Compile Include="PathRelinkers\KnapsackSimultaneousPathRelinker.cs" /> 117 120 <Compile Include="Plugin.cs" /> 118 121 <Compile Include="Properties\AssemblyInfo.cs" /> 119 122 <Compile Include="Analyzers\BestKnapsackSolutionAnalyzer.cs" /> 123 <Compile Include="SimilarityCalculators\KnapsackSimilarityCalculator.cs" /> 120 124 </ItemGroup> 121 125 <ItemGroup> … … 125 129 </ItemGroup> 126 130 <ItemGroup> 131 <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj"> 132 <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project> 133 <Name>HeuristicLab.Analysis-3.3</Name> 134 </ProjectReference> 127 135 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 128 136 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> … … 159 167 <Name>HeuristicLab.Operators-3.3</Name> 160 168 <Private>False</Private> 169 </ProjectReference> 170 <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj"> 171 <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project> 172 <Name>HeuristicLab.Optimization.Operators-3.3</Name> 161 173 </ProjectReference> 162 174 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> … … 198 210 </BootstrapperPackage> 199 211 </ItemGroup> 212 <ItemGroup /> 200 213 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 201 214 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. … … 207 220 --> 208 221 <PropertyGroup> 209 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)222 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 210 223 set ProjectDir=$(ProjectDir) 211 224 set SolutionDir=$(SolutionDir) … … 214 227 call PreBuildEvent.cmd 215 228 </PreBuildEvent> 229 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 230 export ProjectDir=$(ProjectDir) 231 export SolutionDir=$(SolutionDir) 232 233 $SolutionDir/PreBuildEvent.sh 234 </PreBuildEvent> 216 235 </PropertyGroup> 217 236 </Project> -
branches/OaaS/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs
r7351 r9363 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HeuristicLab.Analysis; 25 26 using HeuristicLab.Common; 26 27 using HeuristicLab.Core; … … 80 81 private BestKnapsackSolutionAnalyzer BestKnapsackSolutionAnalyzer { 81 82 get { return Operators.OfType<BestKnapsackSolutionAnalyzer>().FirstOrDefault(); } 83 } 84 private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer { 85 get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); } 82 86 } 83 87 #endregion … … 228 232 } 229 233 private void ParameterizeAnalyzer() { 230 BestKnapsackSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name; 231 BestKnapsackSolutionAnalyzer.MaximizationParameter.Hidden = true; 232 BestKnapsackSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name; 233 BestKnapsackSolutionAnalyzer.BestKnownQualityParameter.Hidden = true; 234 BestKnapsackSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name; 235 BestKnapsackSolutionAnalyzer.BestKnownSolutionParameter.Hidden = true; 236 BestKnapsackSolutionAnalyzer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 237 BestKnapsackSolutionAnalyzer.BinaryVectorParameter.Hidden = true; 238 BestKnapsackSolutionAnalyzer.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name; 239 BestKnapsackSolutionAnalyzer.KnapsackCapacityParameter.Hidden = true; 240 BestKnapsackSolutionAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name; 241 BestKnapsackSolutionAnalyzer.WeightsParameter.Hidden = true; 242 BestKnapsackSolutionAnalyzer.ValuesParameter.ActualName = ValuesParameter.Name; 243 BestKnapsackSolutionAnalyzer.ValuesParameter.Hidden = true; 234 if (BestKnapsackSolutionAnalyzer != null) { 235 BestKnapsackSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name; 236 BestKnapsackSolutionAnalyzer.MaximizationParameter.Hidden = true; 237 BestKnapsackSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name; 238 BestKnapsackSolutionAnalyzer.BestKnownQualityParameter.Hidden = true; 239 BestKnapsackSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name; 240 BestKnapsackSolutionAnalyzer.BestKnownSolutionParameter.Hidden = true; 241 BestKnapsackSolutionAnalyzer.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 242 BestKnapsackSolutionAnalyzer.BinaryVectorParameter.Hidden = true; 243 BestKnapsackSolutionAnalyzer.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name; 244 BestKnapsackSolutionAnalyzer.KnapsackCapacityParameter.Hidden = true; 245 BestKnapsackSolutionAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name; 246 BestKnapsackSolutionAnalyzer.WeightsParameter.Hidden = true; 247 BestKnapsackSolutionAnalyzer.ValuesParameter.ActualName = ValuesParameter.Name; 248 BestKnapsackSolutionAnalyzer.ValuesParameter.Hidden = true; 249 } 250 251 if (SingleObjectivePopulationDiversityAnalyzer != null) { 252 SingleObjectivePopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name; 253 SingleObjectivePopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName; 254 SingleObjectivePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results"; 255 SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<KnapsackSimilarityCalculator>().SingleOrDefault(); 256 } 244 257 } 245 258 private void InitializeOperators() { 259 Operators.Add(new KnapsackImprovementOperator()); 260 Operators.Add(new KnapsackPathRelinker()); 261 Operators.Add(new KnapsackSimultaneousPathRelinker()); 262 Operators.Add(new KnapsackSimilarityCalculator()); 263 246 264 Operators.Add(new BestKnapsackSolutionAnalyzer()); 265 Operators.Add(new SingleObjectivePopulationDiversityAnalyzer()); 247 266 ParameterizeAnalyzer(); 248 267 foreach (IBinaryVectorOperator op in ApplicationManager.Manager.GetInstances<IBinaryVectorOperator>()) { … … 286 305 op.ValuesParameter.Hidden = true; 287 306 } 288 foreach ( var op in Operators.OfType<IBinaryVectorMultiNeighborhoodShakingOperator>()) {307 foreach (IBinaryVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IBinaryVectorMultiNeighborhoodShakingOperator>()) { 289 308 op.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 290 309 op.BinaryVectorParameter.Hidden = true; 310 } 311 foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) { 312 op.SolutionParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 313 op.SolutionParameter.Hidden = true; 314 } 315 foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) { 316 op.ParentsParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName; 317 op.ParentsParameter.Hidden = true; 318 } 319 foreach (KnapsackSimilarityCalculator op in Operators.OfType<KnapsackSimilarityCalculator>()) { 320 op.SolutionVariableName = SolutionCreator.BinaryVectorParameter.ActualName; 321 op.QualityVariableName = Evaluator.QualityParameter.ActualName; 291 322 } 292 323 } -
branches/OaaS/HeuristicLab.Problems.Knapsack/3.3/Plugin.cs.frame
r7259 r9363 26 26 /// Plugin class for HeuristicLab.Problems.Knapsack plugin 27 27 /// </summary> 28 [Plugin("HeuristicLab.Problems.Knapsack", "3.3. 6.$WCREV$")]28 [Plugin("HeuristicLab.Problems.Knapsack", "3.3.7.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.Knapsack-3.3.dll", PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] 30 31 [PluginDependency("HeuristicLab.Collections", "3.3")] 31 32 [PluginDependency("HeuristicLab.Common", "3.3")] … … 36 37 [PluginDependency("HeuristicLab.Operators", "3.3")] 37 38 [PluginDependency("HeuristicLab.Optimization", "3.3")] 39 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 38 40 [PluginDependency("HeuristicLab.Parameters", "3.3")] 39 41 [PluginDependency("HeuristicLab.Persistence", "3.3")] -
branches/OaaS/HeuristicLab.Problems.Knapsack/3.3/Properties/AssemblyInfo.cs.frame
r7259 r9363 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.
