Free cookie consent management tool by TermsFeed Policy Generator

Changeset 10753


Ignore:
Timestamp:
04/15/14 18:01:54 (10 years ago)
Author:
abeham
Message:

#2174: The problem is now not Sim# specific anymore, but the parameters of Sim# models could be optimized using this problem. It's all about being able to program the evaluation function and parameter vector.

Location:
branches/SimSharp
Files:
24 added
3 deleted
6 edited
7 copied
3 moved

Legend:

Unmodified
Added
Removed

  • branches/SimSharp/3.0.4/SimSharp-3.0.4/Plugin.cs

    r10726 r10753  
    2323
    2424namespace HeuristicLab.SimSharp {
    25   [Plugin("HeuristicLab.SimSharp", "Transport plugin for SimSharp", "3.0.3.0")]
    26   [PluginFile("HeuristicLab.SimSharp-3.0.3.dll", PluginFileType.Assembly)]
     25  [Plugin("HeuristicLab.SimSharp", "Transport plugin for SimSharp", "3.0.4.0")]
     26  [PluginFile("HeuristicLab.SimSharp-3.0.4.dll", PluginFileType.Assembly)]
    2727  [PluginFile("SimSharp.dll", PluginFileType.Assembly)]
    2828  [PluginFile("SimSharp-License.txt", PluginFileType.License)]

  • branches/SimSharp/3.0.4/SimSharp-3.0.4/Properties/AssemblyInfo.cs

    r10726 r10753  
    2727// associated with an assembly.
    2828[assembly: AssemblyTitle("HeuristicLab.SimSharp")]
    29 [assembly: AssemblyDescription("Transport plugin for SimSharp")]
     29[assembly: AssemblyDescription("Transport plugin for Sim#")]
    3030[assembly: AssemblyConfiguration("")]
    3131[assembly: AssemblyCompany("HEAL")]
    … …  
    5353// by using the '*' as shown below:
    5454// [assembly: AssemblyVersion("1.0.*")]
    55 [assembly: AssemblyVersion("3.0.3.0")]
    56 [assembly: AssemblyFileVersion("3.0.3.0")]
     55[assembly: AssemblyVersion("3.0.4.0")]
     56[assembly: AssemblyFileVersion("3.0.4.0")]

  • branches/SimSharp/3.0.4/SimSharp-3.0.4/SimSharp-3.0.4.csproj

    r10745 r10753  
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    1010    <RootNamespace>HeuristicLab.SimSharp</RootNamespace>
    11     <AssemblyName>HeuristicLab.SimSharp-3.0.3</AssemblyName>
     11    <AssemblyName>HeuristicLab.SimSharp-3.0.4</AssemblyName>
    1212    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>

  • branches/SimSharp/HeuristicLab.Problems.Programmable.Views/3.3/Plugin.cs.frame

    r10745 r10753  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Problems.SimulationOptimization {
    25   [Plugin("HeuristicLab.Problems.SimulationOptimization", "Parameter optimization of SimSharp simulation models", "3.3.0.$WCREV$")]
    26   [PluginFile("HeuristicLab.Problems.SimulationOptimization-3.3.dll", PluginFileType.Assembly)]
    27   [PluginDependency("HeuristicLab.SimSharp", "3.0.3")]
    28   public class HeuristicLabProblemsSimulationOptimizationPlugin : PluginBase { }
     24namespace HeuristicLab.Problems.Programmable.Views {
     25  [Plugin("HeuristicLab.Problems.Programmable.Views", "Views for programmable problem for defining custom representation and evaluation function.", "3.3.9.$WCREV$")]
     26  [PluginFile("HeuristicLab.Problems.Programmable.Views-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Problems.Programmable", "3.3")]
     28  public class HeuristicLabProblemsProgrammableViewsPlugin : PluginBase { }
    2929}

  • branches/SimSharp/HeuristicLab.Problems.Programmable.Views/3.3/Properties/AssemblyInfo.cs.frame

    r10745 r10753  
    2626// set of attributes. Change these attribute values to modify the information
    2727// associated with an assembly.
    28 [assembly: AssemblyTitle("HeuristicLab.Problems.SimulationOptimization")]
     28[assembly: AssemblyTitle("HeuristicLab.Problems.Programmable.Views")]
    2929[assembly: AssemblyDescription("")]
    3030[assembly: AssemblyConfiguration("")]
    … …  
    4141
    4242// The following GUID is for the ID of the typelib if this project is exposed to COM
    43 [assembly: Guid("c45d2b76-5386-4f21-8d2b-ecf5c9ddaf0d")]
     43[assembly: Guid("04b67c2a-b8ad-461f-ad4f-4587f96fda45")]
    4444
    4545// Version information for an assembly consists of the following four values:

  • branches/SimSharp/HeuristicLab.Problems.Programmable/3.3

    • Property svn:global-ignores

      •  

        old new  
        11obj
        22Plugin.cs
         3*.DotSettings

  • branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

    r10745 r10753  
    88    <OutputType>Library</OutputType>
    99    <AppDesignerFolder>Properties</AppDesignerFolder>
    10     <RootNamespace>HeuristicLab.Problems.SimulationOptimization</RootNamespace>
    11     <AssemblyName>HeuristicLab.Problems.SimulationOptimization-3.3</AssemblyName>
     10    <RootNamespace>HeuristicLab.Problems.Programmable</RootNamespace>
     11    <AssemblyName>HeuristicLab.Problems.Programmable-3.3</AssemblyName>
    1212    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    … …  
    3838  </PropertyGroup>
    3939  <ItemGroup>
     40    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     41      <SpecificVersion>False</SpecificVersion>
     42      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     43      <Private>False</Private>
     44    </Reference>
     45    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     46      <SpecificVersion>False</SpecificVersion>
     47      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     48      <Private>False</Private>
     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>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     53      <Private>False</Private>
     54    </Reference>
     55    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     56      <SpecificVersion>False</SpecificVersion>
     57      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     58      <Private>False</Private>
     59    </Reference>
     60    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     61      <SpecificVersion>False</SpecificVersion>
     62      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     63      <Private>False</Private>
     64    </Reference>
     65    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     66      <SpecificVersion>False</SpecificVersion>
     67      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     68      <Private>False</Private>
     69    </Reference>
     70    <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     71      <SpecificVersion>False</SpecificVersion>
     72      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
     73      <Private>False</Private>
     74    </Reference>
     75    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     76      <SpecificVersion>False</SpecificVersion>
     77      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
     78      <Private>False</Private>
     79    </Reference>
     80    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     81      <SpecificVersion>False</SpecificVersion>
     82      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     83      <Private>False</Private>
     84    </Reference>
     85    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     86      <SpecificVersion>False</SpecificVersion>
     87      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     88      <Private>False</Private>
     89    </Reference>
     90    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     91      <SpecificVersion>False</SpecificVersion>
     92      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     93    </Reference>
     94    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     95      <SpecificVersion>False</SpecificVersion>
     96      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     97      <Private>False</Private>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     100      <SpecificVersion>False</SpecificVersion>
     101      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     102      <Private>False</Private>
     103    </Reference>
     104    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     105      <SpecificVersion>False</SpecificVersion>
     106      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     107      <Private>False</Private>
     108    </Reference>
    40109    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    41110      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    42111      <Private>False</Private>
    43112    </Reference>
     113    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <SpecificVersion>False</SpecificVersion>
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     116      <Private>False</Private>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Scripting-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     119      <SpecificVersion>False</SpecificVersion>
     120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Scripting-3.3.dll</HintPath>
     121      <Private>False</Private>
     122    </Reference>
     123    <Reference Include="SimSharp, Version=3.0.3.0, Culture=neutral, PublicKeyToken=4222a9c6c8b27052, processorArchitecture=MSIL">
     124      <SpecificVersion>False</SpecificVersion>
     125      <HintPath>..\..\..\..\trunk\sources\bin\SimSharp.dll</HintPath>
     126      <Private>False</Private>
     127    </Reference>
    44128    <Reference Include="System" />
    45129    <Reference Include="System.Core" />
     130    <Reference Include="System.Drawing" />
    46131    <Reference Include="System.Xml.Linq" />
    47132    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    51136  </ItemGroup>
    52137  <ItemGroup>
     138    <Compile Include="Interfaces\ISingleObjectiveProgrammableProblemEvaluator.cs" />
     139    <Compile Include="Operators\ParameterVectorManipulator.cs" />
     140    <Compile Include="Operators\ParameterVectorCrossover.cs" />
     141    <Compile Include="Operators\SimOptSingleObjectiveEvaluator.cs" />
     142    <Compile Include="Operators\ParameterVectorCreater.cs" />
     143    <Compile Include="ProgrammableProblemBase.cs" />
     144    <Compile Include="ProgrammableProblemScript.cs" />
     145    <Compile Include="SingleObjectiveProgrammableProblem.cs" />
    53146    <None Include="HeuristicLab.snk" />
    54147    <None Include="Plugin.cs.frame" />
    … …  
    56149    <None Include="Properties\AssemblyInfo.cs.frame" />
    57150    <Compile Include="Properties\AssemblyInfo.cs" />
     151  </ItemGroup>
     152  <ItemGroup>
     153    <ProjectReference Include="..\..\HeuristicLab.Encodings.ParameterVector\HeuristicLab.Encodings.ParameterVectorEncoding-3.3.csproj">
     154      <Project>{ba2b2335-ef06-473f-b06d-210f356f8ebd}</Project>
     155      <Name>HeuristicLab.Encodings.ParameterVectorEncoding-3.3</Name>
     156    </ProjectReference>
    58157  </ItemGroup>
    59158  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

    r10726 r10753  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Problems.SimulationOptimization {
    25   [Plugin("HeuristicLab.Problems.SimulationOptimization", "Parameter optimization of SimSharp simulation models", "3.3.0.$WCREV$")]
    26   [PluginFile("HeuristicLab.Problems.SimulationOptimization-3.3.dll", PluginFileType.Assembly)]
    27   [PluginDependency("HeuristicLab.SimSharp", "3.0.3")]
    28   public class HeuristicLabProblemsSimulationOptimizationPlugin : PluginBase { }
     24namespace HeuristicLab.Problems.Programmable {
     25  [Plugin("HeuristicLab.Problems.Programmable", "Programmable problem for defining custom representation and evaluation function.", "3.3.9.$WCREV$")]
     26  [PluginFile("HeuristicLab.Problems.Programmable-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Encodings.ParameterVectorEncoding", "3.3")]
     28  public class HeuristicLabProblemsProgrammablePlugin : PluginBase { }
    2929}

  • branches/SimSharp/HeuristicLab.Problems.Programmable/3.3/Properties/AssemblyInfo.cs.frame

    r10726 r10753  
    2626// set of attributes. Change these attribute values to modify the information
    2727// associated with an assembly.
    28 [assembly: AssemblyTitle("HeuristicLab.Problems.SimulationOptimization")]
     28[assembly: AssemblyTitle("HeuristicLab.Problems.Programmable")]
    2929[assembly: AssemblyDescription("")]
    3030[assembly: AssemblyConfiguration("")]

  • branches/SimSharp/ProgrammableProblem.sln

    r10745 r10753  
    44VisualStudioVersion = 12.0.30110.0
    55MinimumVisualStudioVersion = 10.0.40219.1
    6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimSharp-3.0.3", "3.0.3\SimSharp-3.0.3\SimSharp-3.0.3.csproj", "{F119BE16-82B7-4EC1-86C3-C1197DEE7F4A}"
     6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimSharp-3.0.4", "3.0.4\SimSharp-3.0.4\SimSharp-3.0.4.csproj", "{F119BE16-82B7-4EC1-86C3-C1197DEE7F4A}"
    77EndProject
    8 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.SimulationOptimization-3.3", "HeuristicLab.Problems.SimulationOptimization\3.3\HeuristicLab.Problems.SimulationOptimization-3.3.csproj", "{EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}"
     8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Programmable-3.3", "HeuristicLab.Problems.Programmable\3.3\HeuristicLab.Problems.Programmable-3.3.csproj", "{EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}"
     9EndProject
     10Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.ParameterVectorEncoding-3.3", "HeuristicLab.Encodings.ParameterVector\HeuristicLab.Encodings.ParameterVectorEncoding-3.3.csproj", "{BA2B2335-EF06-473F-B06D-210F356F8EBD}"
     11EndProject
     12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Programmable.Views-3.3", "HeuristicLab.Problems.Programmable.Views\3.3\HeuristicLab.Problems.Programmable.Views-3.3.csproj", "{6F023B90-2091-40A9-8AC0-B0338DFF8E5F}"
    913EndProject
    1014Global
    … …  
    2226    {EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2327    {EE07BFF8-B23D-41F5-8AD7-AC9598D7A2C9}.Release|Any CPU.Build.0 = Release|Any CPU
     28    {BA2B2335-EF06-473F-B06D-210F356F8EBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     29    {BA2B2335-EF06-473F-B06D-210F356F8EBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
     30    {BA2B2335-EF06-473F-B06D-210F356F8EBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
     31    {BA2B2335-EF06-473F-B06D-210F356F8EBD}.Release|Any CPU.Build.0 = Release|Any CPU
     32    {6F023B90-2091-40A9-8AC0-B0338DFF8E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     33    {6F023B90-2091-40A9-8AC0-B0338DFF8E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
     34    {6F023B90-2091-40A9-8AC0-B0338DFF8E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
     35    {6F023B90-2091-40A9-8AC0-B0338DFF8E5F}.Release|Any CPU.Build.0 = Release|Any CPU
    2436  EndGlobalSection
    2537  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.