Changeset 16565 for trunk/HeuristicLab.Problems.ExternalEvaluation.Scilab
- Timestamp:
- 01/28/19 13:41:42 (6 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj
r11723 r16565 10 10 <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.Scilab</RootNamespace> 11 11 <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 <TargetFrameworkProfile /> … … 85 85 <Private>False</Private> 86 86 </Reference> 87 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> 88 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath> 89 </Reference> 90 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 91 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath> 92 </Reference> 87 93 <Reference Include="HeuristicLab.DotNetScilab-1.0, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 88 94 <SpecificVersion>False</SpecificVersion> … … 93 99 <Reference Include="System.Core" /> 94 100 <Reference Include="System.Drawing" /> 101 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> 102 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath> 103 </Reference> 95 104 <Reference Include="System.Windows.Forms" /> 96 105 <Reference Include="System.Xml.Linq" /> … … 108 117 <ItemGroup> 109 118 <None Include="HeuristicLab.snk" /> 119 <None Include="packages.config" /> 110 120 <None Include="Plugin.cs.frame" /> 111 121 <None Include="Properties\AssemblyInfo.cs.frame" /> -
trunk/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Plugin.cs.frame
r15589 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Properties/AssemblyInfo.cs.frame
r15589 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterOptimizationProblem.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 24 24 using HeuristicLab.Data; 25 25 using HeuristicLab.Parameters; 26 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;26 using HEAL.Attic; 27 27 using HeuristicLab.Problems.ParameterOptimization; 28 28 29 29 namespace HeuristicLab.Problems.ExternalEvaluation.Scilab { 30 30 [Item("Scilab Parameter Optimization Problem", "Optimization of a parameter vector which is evaluated in Scilab.")] 31 [Storable Class]31 [StorableType("247B26FF-0C43-44EA-A768-183B9B60653B")] 32 32 [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 120)] 33 33 public class ScilabParameterOptimizationProblem : ParameterOptimizationProblem { … … 63 63 64 64 [StorableConstructor] 65 protected ScilabParameterOptimizationProblem( bool deserializing) : base(deserializing) { }65 protected ScilabParameterOptimizationProblem(StorableConstructorFlag _) : base(_) { } 66 66 protected ScilabParameterOptimizationProblem(ScilabParameterOptimizationProblem original, Cloner cloner) 67 67 : base(original, cloner) { -
trunk/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterVectorEvaluator.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Problems.ParameterOptimization; 31 31 using ScilabConnector = DotNetScilab.Scilab; … … 33 33 namespace HeuristicLab.Problems.ExternalEvaluation.Scilab { 34 34 [Item("SciLabParameterVectorEvaluator", "An evaluator which takes a parameter vector and returns a quality value, calculated by a Scilab script.")] 35 [Storable Class]35 [StorableType("B0EEB2BC-B35E-47AC-93DE-8B2C0EFF8650")] 36 36 public sealed class ScilabParameterVectorEvaluator : ParameterVectorEvaluator { 37 37 private const string MaximizationParameterName = "Maximization"; … … 56 56 57 57 [StorableConstructor] 58 private ScilabParameterVectorEvaluator( bool deserializing) : base(deserializing) { }58 private ScilabParameterVectorEvaluator(StorableConstructorFlag _) : base(_) { } 59 59 private ScilabParameterVectorEvaluator(ScilabParameterVectorEvaluator original, Cloner cloner) 60 60 : base(original, cloner) {
Note: See TracChangeset
for help on using the changeset viewer.