Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/16/11 22:32:33 (14 years ago)
Author:
abeham
Message:

#1330

  • Moved MDS into Analysis
  • Added test with some simple examples
Location:
branches/QAP
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/QAP

    • Property svn:ignore

      •  

        old new  
        11*.suo
        22TestResults
         3*.testsettings

  • branches/QAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r5560 r5723  
    9696  </PropertyGroup>
    9797  <ItemGroup>
     98    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     99      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     100    </Reference>
     101    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     102      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     105      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     108      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     111      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Operators-3.3">
     114      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     117      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     120      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     123      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     124    </Reference>
    98125    <Reference Include="System" />
    99126    <Reference Include="System.Core">
    … …  
    187214  </ItemGroup>
    188215  <ItemGroup>
    189     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    190       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    191       <Name>HeuristicLab.Collections-3.3</Name>
    192     </ProjectReference>
    193     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    194       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    195       <Name>HeuristicLab.Common.Resources-3.3</Name>
    196     </ProjectReference>
    197     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    198       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    199       <Name>HeuristicLab.Common-3.3</Name>
    200     </ProjectReference>
    201     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    202       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    203       <Name>HeuristicLab.Core-3.3</Name>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    206       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    207       <Name>HeuristicLab.Data-3.3</Name>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    210       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    211       <Name>HeuristicLab.Parameters-3.3</Name>
    212     </ProjectReference>
    213     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    214       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    215       <Name>HeuristicLab.Persistence-3.3</Name>
    216     </ProjectReference>
    217     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    218       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    219       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    220     </ProjectReference>
    221   </ItemGroup>
    222   <ItemGroup>
    223216    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    224217      <Visible>False</Visible>

  • branches/QAP/HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs

    r5445 r5723  
    4141      : base() {
    4242      Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized."));
    43       Parameters.Add(new ValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
     43      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
    4444    }
    4545
    46     public ValueParameter<BoolValue> MaximizationParameter {
     46    [StorableHook(HookType.AfterDeserialization)]
     47    protected virtual void AfterDeserialization() {
     48      // BackwardsCompatibility3.3
     49      #region Backwards compatible code (remove with 3.4)
     50      if (BestKnownQualityParameter is ValueParameter<DoubleValue>) {
     51        Parameters.Remove(BestKnownQualityParameterName);
     52        Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
     53      }
     54      #endregion
     55    }
     56
     57    public IValueParameter<BoolValue> MaximizationParameter {
    4758      get { return (ValueParameter<BoolValue>)Parameters[MaximizationParameterName]; }
    4859    }
    … …  
    5566    }
    5667
    57     public ValueParameter<DoubleValue> BestKnownQualityParameter {
    58       get { return (ValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
     68    public IValueParameter<DoubleValue> BestKnownQualityParameter {
     69      get { return (IValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
    5970    }
    6071    IParameter ISingleObjectiveProblem.BestKnownQualityParameter {
Note: See TracChangeset for help on using the changeset viewer.