Changeset 8955 for branches

Timestamp:

11/27/12 22:12:58 (12 years ago)

Author:

abeham

Message:

#1985: Added optimizer and view

Location:

branches/RuntimeOptimizer

Files:

• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.cs (added)
• HeuristicLab.Optimization.Views/3.3/TimeLimitRunView.resx (added)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (5 diffs)
• HeuristicLab.Optimization/3.3/MetaOptimizers (added)
• HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs (moved) (moved from branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/BatchRun.cs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs (moved) (moved from branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/Experiment.cs)
• HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (added)

branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -263 +263 @@
       <DependentUpon>RunCollectionDataTableView.cs</DependentUpon>
     </Compile>
+    <Compile Include="TimeLimitRunView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TimeLimitRunView.Designer.cs">
+      <DependentUpon>TimeLimitRunView.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserDefinedAlgorithmView.cs">
       <SubType>UserControl</SubType>
@@ -391 +397 @@
       <Private>False</Private>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimeLimitRunView.resx">
+      <DependentUpon>TimeLimitRunView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/RuntimeOptimizer/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -121 +121 @@
     <Compile Include="Interfaces\ISimilarityBasedOperator.cs" />
     <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" />
+    <Compile Include="MetaOptimizers\BatchRun.cs" />
+    <Compile Include="MetaOptimizers\Experiment.cs" />
+    <Compile Include="MetaOptimizers\TimeLimitRun.cs" />
     <Compile Include="RunCollectionModification\RunCollectionRunRemover.cs" />
     <Compile Include="Plugin.cs" />
@@ -130 +133 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="Algorithms\Algorithm.cs" />
-    <Compile Include="BatchRun.cs" />
     <Compile Include="RunCollectionModification\Calculator.cs" />
     <Compile Include="Interfaces\IDiscreteDoubleMatrixModifier.cs" />
@@ -173 +175 @@
     <Compile Include="RunCollectionConstraints\IRunCollectionConstraint.cs" />
     <Compile Include="OptimizerList.cs" />
-    <Compile Include="Experiment.cs" />
     <Compile Include="Interfaces\IOptimizer.cs" />
     <Compile Include="RunCollection.cs" />
@@ -281 +282 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -288 +289 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)