Changeset 16818


Ignore:
Timestamp:
04/18/19 15:43:11 (4 months ago)
Author:
bburlacu
Message:

#2635: Update solution to .net framework version 4.6.1, switch to new persistence, add plugin frame file and prebuild event.

Location:
branches/2635_HeuristicLab.OSGAEvaluator
Files:
3 added
5 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator

    • Property svn:ignore set to
      Plugin.cs
  • branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/AdjustedEvaluatedSolutionsAnalyzer.cs

    r14428 r16818  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
     
    2526using HeuristicLab.Optimization;
    2627using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2929using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
     
    3131namespace HeuristicLab.OSGAEvaluator {
    3232  [Item("AdjustedEvaluatedSolutionsAnalyzer", "Analyzer which aggregates the adjusted evaluated solutions count from the predictive evaluator.")]
    33   [StorableClass]
     33  [StorableType("791A5594-FC15-41AF-9D06-86D1313C4C8B")]
    3434  public class AdjustedEvaluatedSolutionsAnalyzer : SymbolicDataAnalysisSingleObjectiveAnalyzer {
    3535    private const string EvaluatorParameterName = "Evaluator";
     
    4949
    5050    [StorableConstructor]
    51     protected AdjustedEvaluatedSolutionsAnalyzer(bool deserializing) : base(deserializing) { }
     51    protected AdjustedEvaluatedSolutionsAnalyzer(StorableConstructorFlag _) : base(_) { }
    5252
    5353    protected AdjustedEvaluatedSolutionsAnalyzer(AdjustedEvaluatedSolutionsAnalyzer original, Cloner cloner) : base(original, cloner) { }
  • branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator.csproj

    r14428 r16818  
    1010    <RootNamespace>HeuristicLab.OSGAEvaluator</RootNamespace>
    1111    <AssemblyName>HeuristicLab.OSGAEvaluator</AssemblyName>
    12     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
     14    <TargetFrameworkProfile />
    1415  </PropertyGroup>
    1516  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     
    1718    <DebugType>full</DebugType>
    1819    <Optimize>false</Optimize>
    19     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     20    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    2021    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2122    <ErrorReport>prompt</ErrorReport>
     
    2526    <DebugType>pdbonly</DebugType>
    2627    <Optimize>true</Optimize>
    27     <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     28    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    2829    <DefineConstants>TRACE</DefineConstants>
    2930    <ErrorReport>prompt</ErrorReport>
     
    3738  </PropertyGroup>
    3839  <ItemGroup>
     40    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     41      <SpecificVersion>False</SpecificVersion>
     42      <HintPath>..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     43      <Private>False</Private>
     44    </Reference>
    3945    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    4046      <SpecificVersion>False</SpecificVersion>
    41       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     47      <HintPath>..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     48      <Private>False</Private>
     49    </Reference>
     50    <Reference Include="HeuristicLab.Attic, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     51      <SpecificVersion>False</SpecificVersion>
     52      <HintPath>..\..\..\trunk\bin\HeuristicLab.Attic.dll</HintPath>
    4253      <Private>False</Private>
    4354    </Reference>
    4455    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    4556      <SpecificVersion>False</SpecificVersion>
    46       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     57      <HintPath>..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    4758      <Private>False</Private>
    4859    </Reference>
    4960    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    5061      <SpecificVersion>False</SpecificVersion>
    51       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     62      <HintPath>..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
    5263      <Private>False</Private>
    5364    </Reference>
    5465    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    5566      <SpecificVersion>False</SpecificVersion>
    56       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     67      <HintPath>..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
    5768      <Private>False</Private>
    5869    </Reference>
    5970    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6071      <SpecificVersion>False</SpecificVersion>
    61       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     72      <HintPath>..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
    6273      <Private>False</Private>
    6374    </Reference>
    6475    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    6576      <SpecificVersion>False</SpecificVersion>
    66       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     77      <HintPath>..\..\..\trunk\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    6778      <Private>False</Private>
    6879    </Reference>
    6980    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    7081      <SpecificVersion>False</SpecificVersion>
    71       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     82      <HintPath>..\..\..\trunk\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    7283      <Private>False</Private>
    7384    </Reference>
    7485    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    7586      <SpecificVersion>False</SpecificVersion>
    76       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     87      <HintPath>..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    7788      <Private>False</Private>
    7889    </Reference>
    7990    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8091      <SpecificVersion>False</SpecificVersion>
    81       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     92      <HintPath>..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    8293      <Private>False</Private>
    8394    </Reference>
    8495    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8596      <SpecificVersion>False</SpecificVersion>
    86       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     97      <HintPath>..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    8798      <Private>False</Private>
    8899    </Reference>
    89100    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    90101      <SpecificVersion>False</SpecificVersion>
    91       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     102      <HintPath>..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    92103      <Private>False</Private>
    93104    </Reference>
    94105    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    95106      <SpecificVersion>False</SpecificVersion>
    96       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     107      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    97108      <Private>False</Private>
    98109    </Reference>
    99110    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    100111      <SpecificVersion>False</SpecificVersion>
    101       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     112      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    102113      <Private>False</Private>
    103114    </Reference>
    104115    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105116      <SpecificVersion>False</SpecificVersion>
    106       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
     117      <HintPath>..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
    107118      <Private>False</Private>
    108119    </Reference>
     
    119130    <Compile Include="AdjustedEvaluatedSolutionsAnalyzer.cs" />
    120131    <Compile Include="OSGAPredictionCountsAnalyzer.cs" />
     132    <None Include="Plugin.cs.frame" />
    121133    <Compile Include="Plugin.cs" />
    122134    <Compile Include="Properties\AssemblyInfo.cs" />
     
    127139  </ItemGroup>
    128140  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     141  <PropertyGroup>
     142    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     143set ProjectDir=$(ProjectDir)
     144set SolutionDir=$(SolutionDir)
     145set Outdir=$(Outdir)
     146
     147call PreBuildEvent.cmd
     148</PreBuildEvent>
     149  </PropertyGroup>
    129150  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    130151       Other similar extension points exist, see Microsoft.Common.targets.
  • branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/OSGAPredictionCountsAnalyzer.cs

    r14584 r16818  
    2020#endregion
    2121
    22 using System.Linq;
     22using HEAL.Attic;
    2323using HeuristicLab.Analysis;
    2424using HeuristicLab.Common;
     
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2928using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3029using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
     30using System.Linq;
    3131
    3232namespace HeuristicLab.OSGAEvaluator {
    3333  [Item("OSGAPredictionCountsAnalyzer", "An analyzer which records the counts of the rejected offspring predicted by the evaluator without evaluating all rows.")]
    34   [StorableClass]
    35 
     34  [StorableType("7730D977-A422-4C64-83C2-8989EA4B3922")]
    3635  public class OSGAPredictionCountsAnalyzer : SymbolicDataAnalysisSingleObjectiveAnalyzer {
    3736    private const string EvaluatorParameterName = "Evaluator";
     
    4039    public ILookupParameter<SymbolicRegressionSingleObjectiveEvaluator> EvaluatorParameter {
    4140      get { return (ILookupParameter<SymbolicRegressionSingleObjectiveEvaluator>)Parameters[EvaluatorParameterName]; }
     41    }
     42
     43    [StorableConstructor]
     44    protected OSGAPredictionCountsAnalyzer(StorableConstructorFlag _) : base(_) {
    4245    }
    4346
  • branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/Plugin.cs.frame

    r16817 r16818  
    44  [Plugin("HeuristicLab.OSGAEvaluator", "OSGA Evaluator", "3.3.13.0")]
    55  [PluginFile("HeuristicLab.OSGAEvaluator.dll", PluginFileType.Assembly)]
     6  [PluginDependency("HeuristicLab.Attic", "1.0")]
     7  [PluginDependency("HeuristicLab.Analysis", "3.3")]
     8  [PluginDependency("HeuristicLab.Collections", "3.3")]
     9  [PluginDependency("HeuristicLab.Common", "3.3")]
     10  [PluginDependency("HeuristicLab.Core", "3.3")]
     11  [PluginDependency("HeuristicLab.Data", "3.3")]
     12  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.3")]
     13  [PluginDependency("HeuristicLab.Operators", "3.3")]
     14  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     15  [PluginDependency("HeuristicLab.Parameters", "3.3")]
     16  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     17  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.3")]
     18  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.3")]
     19  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.3")]
    620  public class Plugin : PluginBase {
    721  }
  • branches/2635_HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/SymbolicRegressionSingleObjectiveOSGAEvaluator.cs

    r14609 r16818  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    24 using System.Linq;
     22using HEAL.Attic;
    2523using HeuristicLab.Common;
    2624using HeuristicLab.Core;
     
    2927using HeuristicLab.Optimization;
    3028using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using System;
     30using System.Collections.Generic;
     31using System.Linq;
    3232
    3333namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    3434  [Item("SymbolicRegressionSingleObjectiveOSGAEvaluator", "An evaluator which tries to predict when a child will not be able to fullfil offspring selection criteria, to save evaluation time.")]
    35   [StorableClass]
     35  [StorableType("559C6852-9A4F-4C13-9AA5-3D2A44834AC3")]
    3636  public class SymbolicRegressionSingleObjectiveOsgaEvaluator : SymbolicRegressionSingleObjectiveEvaluator {
    3737    private const string RelativeParentChildQualityThresholdParameterName = "RelativeParentChildQualityThreshold";
     
    108108
    109109    // keep track of statistics
     110    [Storable]
    110111    public double AdjustedEvaluatedSolutions { get; set; }
     112    [Storable]
    111113    public IntMatrix RejectedStats { get; set; }
     114    [Storable]
    112115    public IntMatrix TotalStats { get; set; }
    113116
     
    144147
    145148    [StorableConstructor]
    146     protected SymbolicRegressionSingleObjectiveOsgaEvaluator(bool deserializing) : base(deserializing) {
     149    protected SymbolicRegressionSingleObjectiveOsgaEvaluator(StorableConstructorFlag _) : base(_) {
    147150      TotalStats = new IntMatrix();
    148151      RejectedStats = new IntMatrix();
     
    381384          quality = calculatorError == OnlineCalculatorError.None ? r * r : 0d;
    382385        }
    383         AdjustedEvaluatedSolutions += 1d;
     386        AdjustedEvaluatedSolutions++;
    384387        return quality;
    385388      }
Note: See TracChangeset for help on using the changeset viewer.