Changeset 8660 for branches/GP-MoveOperators/HeuristicLab.Optimization.Operators

Timestamp:

09/14/12 18:58:15 (12 years ago)

Author:

gkronber

Message:

#1847 merged r8205:8635 from trunk into branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified) (5 diffs)
• HeuristicLab.Optimization.Operators/3.3/NoSimilarityCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Operators/3.3/NoSimilarityCalculator.cs)
• HeuristicLab.Optimization.Operators/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Optimization.Operators/3.3/ProgrammableAnalyzer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Operators/3.3/ProgrammableAnalyzer.cs)
• HeuristicLab.Optimization.Operators/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/QualitySimilarityCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Operators/3.3/QualitySimilarityCalculator.cs)
• HeuristicLab.Optimization.Operators/3.3/SingleObjectivePathRelinker.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Operators/3.3/SingleObjectivePathRelinker.cs)
• HeuristicLab.Optimization.Operators/3.3/SingleObjectiveSolutionSimilarityCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Operators/3.3/SingleObjectiveSolutionSimilarityCalculator.cs)
• HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs)

branches/GP-MoveOperators

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/GP-MoveOperators/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

@@ -105 +105 @@
     </Reference>
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="NoSimilarityCalculator.cs" />
+    <Compile Include="QualitySimilarityCalculator.cs" />
+    <Compile Include="SingleObjectiveSolutionSimilarityCalculator.cs" />
     <Compile Include="GeneralizedExponentialDiscreteDoubleValueModifier.cs" />
     <Compile Include="MultiObjective\CrowdedComparisonSorter.cs" />
@@ -114 +118 @@
     <Compile Include="MultiObjective\FastNonDominatedSort.cs" />
     <Compile Include="MultiObjective\RankAndCrowdingSorter.cs" />
+    <Compile Include="SingleObjectivePathRelinker.cs" />
     <Compile Include="Plugin.cs" />
+    <Compile Include="ProgrammableAnalyzer.cs" />
     <Compile Include="ShakingOperator.cs" />
+    <Compile Include="SolutionSimilarityCalculator.cs" />
     <Compile Include="UserDefinedCrossover.cs" />
     <Compile Include="UserDefinedEvaluator.cs" />
@@ -163 +170 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators.Programmable\3.3\HeuristicLab.Operators.Programmable-3.3.csproj">
+      <Project>{6A5F8C2D-B0C3-4B36-BC20-9B1A91EE6DB6}</Project>
+      <Name>HeuristicLab.Operators.Programmable-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
@@ -220 +232 @@
   -->
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -227 +239 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
+<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
 </Project>

branches/GP-MoveOperators/HeuristicLab.Optimization.Operators/3.3/Plugin.cs.frame

@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Optimization.Operators plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Optimization.Operators", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.Optimization.Operators", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.Optimization.Operators-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Operators.Programmable", "3.3")]
   [PluginDependency("HeuristicLab.Optimization","3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]

branches/GP-MoveOperators/HeuristicLab.Optimization.Operators/3.3/Properties/AssemblyInfo.cs.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll