Ignore:
Timestamp:
03/17/14 16:05:58 (6 years ago)
Author:
mkommend
Message:

#2171: Added new ParameterOptimizationProblem and the external evaluation with Scilab to the trunk.

Location:
trunk/sources
Files:
2 deleted
2 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources

    • Property svn:ignore
      •  

        old new  
        88FxCopResults.txt
        99Google.ProtocolBuffers-0.9.1.dll
         10Google.ProtocolBuffers-2.4.1.473.dll
        1011HeuristicLab 3.3.5.1.ReSharper.user
        1112HeuristicLab 3.3.6.0.ReSharper.user
        1213HeuristicLab.4.5.resharper.user
        1314HeuristicLab.ExtLibs.6.0.ReSharper.user
         15HeuristicLab.Scripting.Development
        1416HeuristicLab.resharper.user
        1517ProtoGen.exe
         
        1719_ReSharper.HeuristicLab
        1820_ReSharper.HeuristicLab 3.3
         21_ReSharper.HeuristicLab 3.3 Tests
        1922_ReSharper.HeuristicLab.ExtLibs
        2023bin
        2124protoc.exe
        22 _ReSharper.HeuristicLab 3.3 Tests
        23 Google.ProtocolBuffers-2.4.1.473.dll
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj

    r10600 r10605  
    7777  </PropertyGroup>
    7878  <ItemGroup>
    79     <Reference Include="DotNet-Component-Scilab, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     79    <Reference Include="DotNetScilab-1.0, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8080      <SpecificVersion>False</SpecificVersion>
    81       <HintPath>..\..\bin\DotNet-Component-Scilab.dll</HintPath>
    82     </Reference>
    83     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    84       <SpecificVersion>False</SpecificVersion>
    85       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     81      <HintPath>..\..\bin\DotNetScilab-1.0.dll</HintPath>
    8682      <Private>False</Private>
    8783    </Reference>
    88     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     84    <Reference Include="HeuristicLab.DotNetScilab-1.0, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8985      <SpecificVersion>False</SpecificVersion>
    90       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    91       <Private>False</Private>
    92     </Reference>
    93     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    94       <SpecificVersion>False</SpecificVersion>
    95       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    96       <Private>False</Private>
    97     </Reference>
    98     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    99       <SpecificVersion>False</SpecificVersion>
    100       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    101       <Private>False</Private>
    102     </Reference>
    103     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    104       <SpecificVersion>False</SpecificVersion>
    105       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    106       <Private>False</Private>
    107     </Reference>
    108     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    109       <SpecificVersion>False</SpecificVersion>
    110       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    111       <Private>False</Private>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114       <SpecificVersion>False</SpecificVersion>
    115       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    116       <Private>False</Private>
    117     </Reference>
    118     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    119       <SpecificVersion>False</SpecificVersion>
    120       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    121       <Private>False</Private>
    122     </Reference>
    123     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    124       <SpecificVersion>False</SpecificVersion>
    125       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    126       <Private>False</Private>
    127     </Reference>
    128     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    129       <SpecificVersion>False</SpecificVersion>
    130       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     86      <HintPath>..\..\bin\HeuristicLab.DotNetScilab-1.0.dll</HintPath>
    13187      <Private>False</Private>
    13288    </Reference>
     
    153109  </ItemGroup>
    154110  <ItemGroup>
    155     <ProjectReference Include="..\..\HeuristicLab.Problems.ParameterOptimization\3.3\HeuristicLab.Problems.ParameterOptimization.csproj">
     111    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     112      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     113      <Name>HeuristicLab.Collections-3.3</Name>
     114      <Private>False</Private>
     115    </ProjectReference>
     116    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     117      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     118      <Name>HeuristicLab.Common-3.3</Name>
     119      <Private>False</Private>
     120    </ProjectReference>
     121    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     122      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     123      <Name>HeuristicLab.Core-3.3</Name>
     124      <Private>False</Private>
     125    </ProjectReference>
     126    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     127      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     128      <Name>HeuristicLab.Data-3.3</Name>
     129      <Private>False</Private>
     130    </ProjectReference>
     131    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     132      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
     133      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     134      <Private>False</Private>
     135    </ProjectReference>
     136    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     137      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     138      <Name>HeuristicLab.Operators-3.3</Name>
     139      <Private>False</Private>
     140    </ProjectReference>
     141    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     142      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     143      <Name>HeuristicLab.Optimization-3.3</Name>
     144      <Private>False</Private>
     145    </ProjectReference>
     146    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     147      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     148      <Name>HeuristicLab.Parameters-3.3</Name>
     149      <Private>False</Private>
     150    </ProjectReference>
     151    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     152      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     153      <Name>HeuristicLab.Persistence-3.3</Name>
     154      <Private>False</Private>
     155    </ProjectReference>
     156    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     157      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     158      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     159      <Private>False</Private>
     160    </ProjectReference>
     161    <ProjectReference Include="..\..\HeuristicLab.Problems.ParameterOptimization\3.3\HeuristicLab.Problems.ParameterOptimization-3.3.csproj">
    156162      <Project>{d2c39fba-a1d5-403a-9211-b0a299a76313}</Project>
    157       <Name>HeuristicLab.Problems.ParameterOptimization</Name>
     163      <Name>HeuristicLab.Problems.ParameterOptimization-3.3</Name>
    158164      <Private>False</Private>
    159165    </ProjectReference>
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Plugin.cs.frame

    r10600 r10605  
    2828  /// Plugin class for HeuristicLab.Problems.ExternalEvaluation.Scilab plugin.
    2929  /// </summary>
    30   [Plugin("HeuristicLab.Problems.ExternalEvaluation.Scilab", "3.3.8.$WCREV$")]
     30  [Plugin("HeuristicLab.Problems.ExternalEvaluation.Scilab", "3.3.9.$WCREV$")]
    3131  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.dll", PluginFileType.Assembly)]
    32   [PluginFile("DotNet-Component-Scilab.dll",PluginFileType.Assembly)]
    33   [PluginFile("DotNet-Component-Scilab.dll.config",PluginFileType.Data)]
    34   [PluginFile("DotNet-Component-Scilab License.txt", PluginFileType.License)]
     32  [PluginDependency("HeuristicLab.DotNetScilab", "1.0")]
    3533  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3634  [PluginDependency("HeuristicLab.Common", "3.3")]
  • trunk/sources/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterVectorEvaluator.cs

    r10595 r10605  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Problems.ParameterOptimization;
     31using ScilabConnector = DotNetScilab.Scilab;
    3132
    3233namespace HeuristicLab.Problems.ExternalEvaluation.Scilab {
     
    6768
    6869    private readonly object locker = new object();
    69     private static DotNetScilab.Scilab scilab = null;
     70    private static ScilabConnector scilab = null;
    7071    private bool startedScilab = false;
    7172
     
    8485        if (scilab == null) {
    8586          startedScilab = true;
    86           scilab = new DotNetScilab.Scilab(false);
     87          scilab = new ScilabConnector(false);
    8788          if (!string.IsNullOrEmpty(initializationScript.Value)) {
    88             result = DotNetScilab.Scilab.Instance.execScilabScript(initializationScript.Value);
     89            result = scilab.execScilabScript(initializationScript.Value);
    8990            if (result != 0) ThrowSciLabException(initializationScript.Value, result);
    9091          }
     
    128129    private void ThrowSciLabException(string fileName, int errorCode) {
    129130      const string code = "errorMsg = lasterror();";
    130       int result = DotNetScilab.Scilab.Instance.SendScilabJob(code);
     131      int result = scilab.SendScilabJob(code);
    131132      if (result != 0) throw new InvalidOperationException(string.Format("An error occured during the execution of the Scilab script {0}.", fileName));
    132133
    133       string errorMessage = DotNetScilab.Scilab.Instance.readNamedMatrixOfString("errorMsg")[0];
     134      string errorMessage = scilab.readNamedMatrixOfString("errorMsg")[0];
    134135
    135136      string message = string.Format("The error {1} occured during the execution of the Scilab script {0}. "
Note: See TracChangeset for help on using the changeset viewer.