Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3.csproj

    r12007 r17097  
    1010    <RootNamespace>HeuristicLab.Problems.ExternalEvaluation.Scilab</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.ExternalEvaluation.Scilab-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
     
    8585      <Private>False</Private>
    8686    </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-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     92    </Reference>
    8793    <Reference Include="HeuristicLab.DotNetScilab-1.0, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8894      <SpecificVersion>False</SpecificVersion>
     
    9399    <Reference Include="System.Core" />
    94100    <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>
    95104    <Reference Include="System.Windows.Forms" />
    96105    <Reference Include="System.Xml.Linq" />
     
    108117  <ItemGroup>
    109118    <None Include="HeuristicLab.snk" />
     119    <None Include="packages.config" />
    110120    <None Include="Plugin.cs.frame" />
    111121    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Plugin.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • stable/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/Properties/AssemblyInfo.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • stable/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterOptimizationProblem.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.ParameterOptimization;
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation.Scilab {
    3030  [Item("Scilab Parameter Optimization Problem", "Optimization of a parameter vector which is evaluated in Scilab.")]
    31   [StorableClass]
     31  [StorableType("247B26FF-0C43-44EA-A768-183B9B60653B")]
    3232  [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 120)]
    3333  public class ScilabParameterOptimizationProblem : ParameterOptimizationProblem {
     
    6363
    6464    [StorableConstructor]
    65     protected ScilabParameterOptimizationProblem(bool deserializing) : base(deserializing) { }
     65    protected ScilabParameterOptimizationProblem(StorableConstructorFlag _) : base(_) { }
    6666    protected ScilabParameterOptimizationProblem(ScilabParameterOptimizationProblem original, Cloner cloner)
    6767      : base(original, cloner) {
  • stable/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/ScilabParameterVectorEvaluator.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.ParameterOptimization;
    3131using ScilabConnector = DotNetScilab.Scilab;
     
    3333namespace HeuristicLab.Problems.ExternalEvaluation.Scilab {
    3434  [Item("SciLabParameterVectorEvaluator", "An evaluator which takes a parameter vector and returns a quality value, calculated by a Scilab script.")]
    35   [StorableClass]
     35  [StorableType("B0EEB2BC-B35E-47AC-93DE-8B2C0EFF8650")]
    3636  public sealed class ScilabParameterVectorEvaluator : ParameterVectorEvaluator {
    3737    private const string MaximizationParameterName = "Maximization";
     
    5656
    5757    [StorableConstructor]
    58     private ScilabParameterVectorEvaluator(bool deserializing) : base(deserializing) { }
     58    private ScilabParameterVectorEvaluator(StorableConstructorFlag _) : base(_) { }
    5959    private ScilabParameterVectorEvaluator(ScilabParameterVectorEvaluator original, Cloner cloner)
    6060      : base(original, cloner) {
  • stable/HeuristicLab.Problems.ExternalEvaluation.Scilab/3.3/packages.config

    r16565 r17097  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66</packages>
Note: See TracChangeset for help on using the changeset viewer.