Changeset 10122

Timestamp:

11/11/13 16:16:11 (11 years ago)

Author:

mkommend

Message:

#2082: Added Scilab .NET coupling to external evaluation branch.

Location:

branches/HeuristicLab.ExternalEvaluation Scientific

Files:

• DotNetScilab (added)
• DotNetScilab.sln (added)
• DotNetScilab/cs_example (added)
• DotNetScilab/cs_example/Properties (added)
• DotNetScilab/cs_example/Properties/AssemblyInfo.cs (added)
• DotNetScilab/cs_example/cs_example.cs (added)
• DotNetScilab/cs_example/cs_example.csproj (added)
• DotNetScilab/dotnetsci (added)
• DotNetScilab/dotnetsci/DotNetScilab.csproj (added)
• DotNetScilab/dotnetsci/HeuristicLab.snk (added)
• DotNetScilab/dotnetsci/Properties (added)
• DotNetScilab/dotnetsci/Properties/AssemblyInfo.cs (added)
• DotNetScilab/dotnetsci/Scilab.cs (added)
• DotNetScilab/dotnetsci/Scilab_cs_wrapper.cs (added)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/DotNet-Component-Scilab.dll (deleted)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Plugin.cs.frame (modified) (2 diffs)

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj

@@ -79 +79 @@
     <Reference Include="DotNet-Component-Scilab, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\DotNet-Component-Scilab.dll</HintPath>
+      <HintPath>..\..\bin\DotNet-Component-Scilab.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
@@ -153 +153 @@
   </ItemGroup>
   <ItemGroup>
-    <Content Include="DotNet-Component-Scilab.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="Scilab License.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Plugin.cs.frame

@@ -30 +30 @@
   [Plugin("HeuristicLab.Problems.ExternalEvaluation.Scilab", "3.3.8.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.dll", PluginFileType.Assembly)]
-  [PluginFile("DotNet-Component-SciLab.dll",PluginFileType.Assembly)]
+  [PluginFile("DotNet-Component-Scilab.dll",PluginFileType.Assembly)]
   [PluginFile("Scilab License.txt", PluginFileType.License)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -46 +46 @@
     private const string scilab_PATH = @"SCIPATH";
 
-    private static bool loadedOnce = false;
-
     public override void OnLoad() {
       base.OnLoad();
-      if (loadedOnce) return;
 
       var currentPath = Environment.GetEnvironmentVariable("path");