Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/17/12 10:57:14 (12 years ago)
Author:
fschoepp
Message:

#1888:

  • Added a parser for independent scenarios (using the model of the optimization backend)
  • Optimization scenario sample can be found in mappings folder of the web project.
  • Added IScenarioMapper interface which provides functionality to map from the optimization data model to a backend model (e.g. Heuristic Lab data model)
  • Implementations of IScenarioMapper have to be provided as C# code (strings) which will be compiled by using a CSharpCodeProvider. Once compiled, the implementations of the IScenarioMapper are being cached within the platform for further usage.
  • Fixed a bug in web template DecimalMatrix (using i instead of j)
  • Added missing thumprint of localhost certificate to the optimization web project (ServiceConfiguration.Local.cscfg / ServiceConfiguration.Cloud.cscfg)
  • Test project now provides following test cases: Mapping types using IronPython and mapping types using Otis
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/OaaS/HeuristicLab.Services.Optimization.ControllerService.Tests/HeuristicLab.Services.Optimization.ControllerService.Tests.csproj

    r8545 r8817  
    3636  </PropertyGroup>
    3737  <ItemGroup>
     38    <Reference Include="ALGLIB-3.5.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     39      <SpecificVersion>False</SpecificVersion>
     40      <HintPath>..\bin\ALGLIB-3.5.0.dll</HintPath>
     41    </Reference>
     42    <Reference Include="HeuristicLab.Algorithms.GeneticAlgorithm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     43      <SpecificVersion>False</SpecificVersion>
     44      <HintPath>..\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll</HintPath>
     45    </Reference>
     46    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     47      <SpecificVersion>False</SpecificVersion>
     48      <HintPath>..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     49    </Reference>
     50    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     51      <SpecificVersion>False</SpecificVersion>
     52      <HintPath>..\bin\HeuristicLab.Common-3.3.dll</HintPath>
     53    </Reference>
     54    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     55      <SpecificVersion>False</SpecificVersion>
     56      <HintPath>..\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     57    </Reference>
     58    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     59      <SpecificVersion>False</SpecificVersion>
     60      <HintPath>..\bin\HeuristicLab.Core-3.3.dll</HintPath>
     61    </Reference>
     62    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     63      <SpecificVersion>False</SpecificVersion>
     64      <HintPath>..\bin\HeuristicLab.Data-3.3.dll</HintPath>
     65    </Reference>
     66    <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     67      <SpecificVersion>False</SpecificVersion>
     68      <HintPath>..\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
     69    </Reference>
     70    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     71      <SpecificVersion>False</SpecificVersion>
     72      <HintPath>..\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
     73    </Reference>
     74    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     75      <SpecificVersion>False</SpecificVersion>
     76      <HintPath>..\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     77    </Reference>
     78    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     79      <SpecificVersion>False</SpecificVersion>
     80      <HintPath>..\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     81    </Reference>
     82    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     83      <SpecificVersion>False</SpecificVersion>
     84      <HintPath>..\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     85    </Reference>
     86    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     87      <SpecificVersion>False</SpecificVersion>
     88      <HintPath>..\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     89    </Reference>
     90    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     91      <SpecificVersion>False</SpecificVersion>
     92      <HintPath>..\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     93    </Reference>
     94    <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     95      <SpecificVersion>False</SpecificVersion>
     96      <HintPath>..\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     97    </Reference>
     98    <Reference Include="HeuristicLab.ParallelEngine-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     99      <SpecificVersion>False</SpecificVersion>
     100      <HintPath>..\bin\HeuristicLab.ParallelEngine-3.3.dll</HintPath>
     101    </Reference>
     102    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     103      <SpecificVersion>False</SpecificVersion>
     104      <HintPath>..\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <SpecificVersion>False</SpecificVersion>
     108      <HintPath>..\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <SpecificVersion>False</SpecificVersion>
     112      <HintPath>..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <SpecificVersion>False</SpecificVersion>
     116      <HintPath>..\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Problems.TravelingSalesman-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     119      <SpecificVersion>False</SpecificVersion>
     120      <HintPath>..\bin\HeuristicLab.Problems.TravelingSalesman-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Problems.VehicleRouting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     123      <SpecificVersion>False</SpecificVersion>
     124      <HintPath>..\bin\HeuristicLab.Problems.VehicleRouting-3.3.dll</HintPath>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Problems.VehicleRouting-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     127      <SpecificVersion>False</SpecificVersion>
     128      <HintPath>..\bin\HeuristicLab.Problems.VehicleRouting-3.4.dll</HintPath>
     129    </Reference>
     130    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     131      <SpecificVersion>False</SpecificVersion>
     132      <HintPath>..\bin\HeuristicLab.Random-3.3.dll</HintPath>
     133    </Reference>
     134    <Reference Include="HeuristicLab.Tracing-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     135      <SpecificVersion>False</SpecificVersion>
     136      <HintPath>..\bin\HeuristicLab.Tracing-3.3.dll</HintPath>
     137    </Reference>
     138    <Reference Include="IronPython">
     139      <HintPath>..\ip\IronPython.dll</HintPath>
     140    </Reference>
     141    <Reference Include="IronPython.Modules">
     142      <HintPath>..\ip\IronPython.Modules.dll</HintPath>
     143    </Reference>
     144    <Reference Include="Microsoft.Dynamic">
     145      <HintPath>..\ip\Microsoft.Dynamic.dll</HintPath>
     146    </Reference>
     147    <Reference Include="Microsoft.Scripting">
     148      <HintPath>..\ip\Microsoft.Scripting.dll</HintPath>
     149    </Reference>
     150    <Reference Include="Microsoft.Scripting.AspNet">
     151      <HintPath>..\ip\Microsoft.Scripting.AspNet.dll</HintPath>
     152    </Reference>
     153    <Reference Include="Microsoft.Scripting.Metadata">
     154      <HintPath>..\ip\Microsoft.Scripting.Metadata.dll</HintPath>
     155    </Reference>
     156    <Reference Include="Otis">
     157      <HintPath>..\otis\build\bin\Debug\Otis.dll</HintPath>
     158    </Reference>
    38159    <Reference Include="System" />
     160    <Reference Include="System.Configuration" />
    39161    <Reference Include="System.Core" />
     162    <Reference Include="System.Web.Extensions" />
    40163    <Reference Include="System.Xml.Linq" />
    41164    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    55178  </ItemGroup>
    56179  <ItemGroup>
    57     <None Include="app.config" />
     180    <None Include="app.config">
     181      <SubType>Designer</SubType>
     182    </None>
     183    <None Include="mappings\mapping.py" />
     184    <None Include="mappings\scenario.xsd">
     185      <SubType>Designer</SubType>
     186    </None>
     187  </ItemGroup>
     188  <ItemGroup>
     189    <Content Include="mappings\mapping.tsp.xml" />
     190    <Content Include="mappings\tsp.xml" />
    58191  </ItemGroup>
    59192  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     193  <PropertyGroup>
     194    <PostBuildEvent>mkdir $(TargetDir)\mappings
     195copy $(ProjectDir)\mappings\* $(TargetDir)\mappings</PostBuildEvent>
     196  </PropertyGroup>
    60197  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    61198       Other similar extension points exist, see Microsoft.Common.targets.
Note: See TracChangeset for help on using the changeset viewer.