Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8334


Ignore:
Timestamp:
07/26/12 17:09:43 (12 years ago)
Author:
jkarder
Message:

#1331: reintegrated branch

Location:
trunk/sources
Files:
15 edited
22 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources

  • trunk/sources/HeuristicLab 3.3.sln

    r8096 r8334  
    339339EndProject
    340340Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LawnMower.Views", "HeuristicLab.Problems.LawnMower.Views\3.3\HeuristicLab.Problems.LawnMower.Views.csproj", "{71CDE004-C50F-48DF-858E-AB0AAA3537BC}"
     341EndProject
     342Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ScatterSearch-3.3", "HeuristicLab.Algorithms.ScatterSearch\3.3\HeuristicLab.Algorithms.ScatterSearch-3.3.csproj", "{5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}"
    341343EndProject
    342344Global
    … …  
    16581660    {71CDE004-C50F-48DF-858E-AB0AAA3537BC}.Release|x86.ActiveCfg = Release|x86
    16591661    {71CDE004-C50F-48DF-858E-AB0AAA3537BC}.Release|x86.Build.0 = Release|x86
     1662    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1663    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1664    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Debug|x64.ActiveCfg = Debug|x64
     1665    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Debug|x64.Build.0 = Debug|x64
     1666    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Debug|x86.ActiveCfg = Debug|x86
     1667    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Debug|x86.Build.0 = Debug|x86
     1668    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1669    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Release|Any CPU.Build.0 = Release|Any CPU
     1670    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Release|x64.ActiveCfg = Release|x64
     1671    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Release|x64.Build.0 = Release|x64
     1672    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Release|x86.ActiveCfg = Release|x86
     1673    {5FEE5DB4-7FD9-4CBD-BEC2-3FEE17B31A94}.Release|x86.Build.0 = Release|x86
    16601674  EndGlobalSection
    16611675  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

    r8288 r8334  
    105105    </Reference>
    106106    <Reference Include="System.Data" />
     107    <Reference Include="System.Drawing" />
    107108    <Reference Include="System.Xml" />
    108109  </ItemGroup>
    109110  <ItemGroup>
     111    <Compile Include="SingleObjectiveSolutionSimilarityCalculator.cs" />
    110112    <Compile Include="GeneralizedExponentialDiscreteDoubleValueModifier.cs" />
    111113    <Compile Include="MultiObjective\CrowdedComparisonSorter.cs" />
    … …  
    114116    <Compile Include="MultiObjective\FastNonDominatedSort.cs" />
    115117    <Compile Include="MultiObjective\RankAndCrowdingSorter.cs" />
     118    <Compile Include="SingleObjectivePathRelinker.cs" />
    116119    <Compile Include="Plugin.cs" />
    117120    <Compile Include="ProgrammableAnalyzer.cs" />
    118121    <Compile Include="ShakingOperator.cs" />
     122    <Compile Include="SolutionSimilarityCalculator.cs" />
    119123    <Compile Include="UserDefinedCrossover.cs" />
    120124    <Compile Include="UserDefinedEvaluator.cs" />

  • trunk/sources/HeuristicLab.Optimization.Views

    • Property svn:mergeinfo deleted

  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r7980 r8334  
    142142      <DependentUpon>ExperimentListView.cs</DependentUpon>
    143143    </Compile>
     144    <Compile Include="ISimilarityCalculatorView.cs">
     145      <SubType>UserControl</SubType>
     146    </Compile>
     147    <Compile Include="ISimilarityCalculatorView.Designer.cs">
     148      <DependentUpon>ISimilarityCalculatorView.cs</DependentUpon>
     149    </Compile>
    144150    <Compile Include="Plugin.cs" />
    145151    <Compile Include="ProblemView.cs">

  • trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r7228 r8334  
    114114  </ItemGroup>
    115115  <ItemGroup>
     116    <Compile Include="Interfaces\ISingleObjectivePathRelinker.cs" />
     117    <Compile Include="Interfaces\ISingleObjectiveImprovementOperator.cs" />
     118    <Compile Include="Interfaces\ISingleObjectiveSolutionSimilarityCalculator.cs" />
     119    <Compile Include="Interfaces\IImprovementOperator.cs" />
     120    <Compile Include="Interfaces\IPathRelinker.cs" />
     121    <Compile Include="Interfaces\ISimilarityBasedOperator.cs" />
     122    <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" />
    116123    <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
    117124    <Compile Include="Plugin.cs" />

  • trunk/sources/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj

    r6866 r8334  
    109109  <ItemGroup>
    110110    <Compile Include="Evaluators\KnapsackEvaluator.cs" />
     111    <Compile Include="Improvers\KnapsackImprovementOperator.cs" />
    111112    <Compile Include="Interfaces\IKnapsackEvaluator.cs" />
    112113    <Compile Include="Interfaces\IKnapsackMoveEvaluator.cs" />
    … …  
    115116    <Compile Include="MoveEvaluators\KnapsackMoveEvaluator.cs" />
    116117    <Compile Include="MoveEvaluators\KnapsackOneBitflipMoveEvaluator.cs" />
     118    <Compile Include="PathRelinkers\KnapsackPathRelinker.cs" />
     119    <Compile Include="PathRelinkers\KnapsackSimultaneousPathRelinker.cs" />
    117120    <Compile Include="Plugin.cs" />
    118121    <Compile Include="Properties\AssemblyInfo.cs" />
    119122    <Compile Include="Analyzers\BestKnapsackSolutionAnalyzer.cs" />
     123    <Compile Include="SimilarityCalculators\KnapsackSimilarityCalculator.cs" />
    120124  </ItemGroup>
    121125  <ItemGroup>
    … …  
    159163      <Name>HeuristicLab.Operators-3.3</Name>
    160164      <Private>False</Private>
     165    </ProjectReference>
     166    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     167      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     168      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    161169    </ProjectReference>
    162170    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    … …  
    198206    </BootstrapperPackage>
    199207  </ItemGroup>
     208  <ItemGroup />
    200209  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    201210  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

    r7351 r8334  
    244244    }
    245245    private void InitializeOperators() {
     246      Operators.Add(new KnapsackImprovementOperator());
     247      Operators.Add(new KnapsackPathRelinker());
     248      Operators.Add(new KnapsackSimultaneousPathRelinker());
     249      Operators.Add(new KnapsackSimilarityCalculator());
     250
    246251      Operators.Add(new BestKnapsackSolutionAnalyzer());
    247252      ParameterizeAnalyzer();
    … …  
    286291        op.ValuesParameter.Hidden = true;
    287292      }
    288       foreach (var op in Operators.OfType<IBinaryVectorMultiNeighborhoodShakingOperator>()) {
     293      foreach (IBinaryVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IBinaryVectorMultiNeighborhoodShakingOperator>()) {
    289294        op.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
    290295        op.BinaryVectorParameter.Hidden = true;
     296      }
     297      foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
     298        op.SolutionParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
     299        op.SolutionParameter.Hidden = true;
     300      }
     301      foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
     302        op.ParentsParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
     303        op.ParentsParameter.Hidden = true;
     304      }
     305      foreach (KnapsackSimilarityCalculator op in Operators.OfType<KnapsackSimilarityCalculator>()) {
     306        op.SolutionVariableName = SolutionCreator.BinaryVectorParameter.ActualName;
     307        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
    291308      }
    292309    }

  • trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Plugin.cs.frame

    r8246 r8334  
    3636  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3737  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     38  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3839  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3940  [PluginDependency("HeuristicLab.Persistence", "3.3")]

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

    r6866 r8334  
    108108  </ItemGroup>
    109109  <ItemGroup>
     110    <Compile Include="Improvers\SingleObjectiveTestFunctionImprovementOperator.cs" />
     111    <Compile Include="PathRelinkers\SingleObjectiveTestFunctionPathRelinker.cs" />
    110112    <Compile Include="Plugin.cs" />
    111113    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    152154    <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" />
    153155    <Compile Include="RealVectorToRealVectorEncoder.cs" />
     156    <Compile Include="SimilarityCalculators\SingleObjectiveTestFunctionSimilarityCalculator.cs" />
    154157    <Compile Include="SingleObjectiveTestFunctionSolution.cs" />
    155158    <Compile Include="SingleObjectiveTestFunctionProblem.cs" />
    … …  
    193196      <Name>HeuristicLab.Operators-3.3</Name>
    194197      <Private>False</Private>
     198    </ProjectReference>
     199    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     200      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     201      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    195202    </ProjectReference>
    196203    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    … …  
    232239    </BootstrapperPackage>
    233240  </ItemGroup>
     241  <ItemGroup />
    234242  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    235243  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Plugin.cs.frame

    r8246 r8334  
    3636  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3737  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     38  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3839  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3940  [PluginDependency("HeuristicLab.Persistence", "3.3")]

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r7442 r8334  
    257257    }
    258258    private void InitializeOperators() {
     259      Operators.Add(new SingleObjectiveTestFunctionImprovementOperator());
     260      Operators.Add(new SingleObjectiveTestFunctionPathRelinker());
     261      Operators.Add(new SingleObjectiveTestFunctionSimilarityCalculator());
     262
    259263      Operators.Add(new BestSingleObjectiveTestFunctionSolutionAnalyzer());
    260264      ParameterizeAnalyzers();
    … …  
    359363        op.MaximizationParameter.Hidden = true;
    360364      }
    361       foreach (var op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
    362         op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
    363         op.RealVectorParameter.Hidden = true;
     365      foreach (IRealVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
     366        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     367        op.RealVectorParameter.Hidden = true;
     368      }
     369      foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
     370        op.SolutionParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     371        op.SolutionParameter.Hidden = true;
     372      }
     373      foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
     374        op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
     375        op.ParentsParameter.Hidden = true;
     376      }
     377      foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) {
     378        op.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName;
     379        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
     380        op.Bounds = Bounds;
    364381      }
    365382    }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r8208 r8334  
    119119    <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
    120120    <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
     121    <Compile Include="Improvers\TSPImprovementOperator.cs" />
    121122    <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" />
    122123    <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" />
    … …  
    128129    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" />
    129130    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" />
     131    <Compile Include="PathRelinkers\TSPMultipleGuidesPathRelinker.cs" />
     132    <Compile Include="PathRelinkers\TSPPathRelinker.cs" />
     133    <Compile Include="PathRelinkers\TSPSimultaneousPathRelinker.cs" />
    130134    <Compile Include="Plugin.cs" />
     135    <Compile Include="SimilarityCalculators\TSPSimilarityCalculator.cs" />
    131136    <Compile Include="TravelingSalesmanProblem.cs" />
    132137    <Compile Include="PathTSPTour.cs" />
    … …  
    183188      <Name>HeuristicLab.Operators-3.3</Name>
    184189      <Private>False</Private>
     190    </ProjectReference>
     191    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     192      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     193      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    185194    </ProjectReference>
    186195    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Plugin.cs.frame

    r8246 r8334  
    3737  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3838  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     39  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3940  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4041  [PluginDependency("HeuristicLab.Persistence", "3.3")]

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r8221 r8334  
    230230
    231231    private void InitializeOperators() {
     232      Operators.Add(new TSPImprovementOperator());
     233      Operators.Add(new TSPMultipleGuidesPathRelinker());
     234      Operators.Add(new TSPPathRelinker());
     235      Operators.Add(new TSPSimultaneousPathRelinker());
     236      Operators.Add(new TSPSimilarityCalculator());
     237
    232238      Operators.Add(new BestTSPSolutionAnalyzer());
    233239      Operators.Add(new TSPAlleleFrequencyAnalyzer());
    … …  
    350356        op.PermutationParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
    351357        op.PermutationParameter.Hidden = true;
     358      }
     359      foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
     360        op.SolutionParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     361        op.SolutionParameter.Hidden = true;
     362      }
     363      foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
     364        op.ParentsParameter.ActualName = SolutionCreator.PermutationParameter.ActualName;
     365        op.ParentsParameter.Hidden = true;
     366      }
     367      foreach (TSPSimilarityCalculator op in Operators.OfType<TSPSimilarityCalculator>()) {
     368        op.SolutionVariableName = SolutionCreator.PermutationParameter.ActualName;
     369        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
    352370      }
    353371    }
Note: See TracChangeset for help on using the changeset viewer.