Changeset 16864

Timestamp:

04/23/19 13:02:42 (6 years ago)

Author:

gkronber

Message:

#2288: updated to .NET 4.6.1 and new persistence backend for compatibility with current trunk

Location:

branches/2288_HeuristicLab.VariableInteractionNetworks

Files:

• HeuristicLab.VariableInteractionNetworks.Views/3.3/HeuristicLab.VariableInteractionNetworks.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.VariableInteractionNetworks/3.3/HeuristicLab.VariableInteractionNetworks-3.3.csproj (modified) (2 diffs)
• HeuristicLab.VariableInteractionNetworks/3.3/SymbolicDataAnalysisVariableImpactsAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.VariableInteractionNetworks/3.3/VariableInteractionNetwork.cs (modified) (4 diffs)

branches/2288_HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks.Views/3.3/HeuristicLab.VariableInteractionNetworks.Views-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.VariableInteractionNetworks.Views</RootNamespace>
     <AssemblyName>HeuristicLab.VariableInteractionNetworks.Views-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -76 +77 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\trunk\sources\bin\Cola.dll</HintPath>
+    </Reference>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">

branches/2288_HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/HeuristicLab.VariableInteractionNetworks-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.VariableInteractionNetworks</RootNamespace>
     <AssemblyName>HeuristicLab.VariableInteractionNetworks-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -73 +74 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

branches/2288_HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/SymbolicDataAnalysisVariableImpactsAnalyzer.cs

@@ -34 +34 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
+using HEAL.Attic;
 
 namespace HeuristicLab.VariableInteractionNetworks {
   [Item("SymbolicRegressionVariableImpactsAnalyzer", "An analyzer which calculates variable impacts based on the average node impacts from the tree")]
-  [StorableClass]
+  [StorableType("9FF5C215-6A7D-4947-A449-A554D2AA6496")]
   public class SymbolicRegressionVariableImpactsAnalyzer : SymbolicDataAnalysisAnalyzer {
     #region parameter names
@@ -138 +139 @@
 
     [StorableConstructor]
-    protected SymbolicRegressionVariableImpactsAnalyzer(bool deserializing) : base(deserializing) { }
+    protected SymbolicRegressionVariableImpactsAnalyzer(StorableConstructorFlag _) : base(_) { }
 
     [StorableHook(HookType.AfterDeserialization)]

branches/2288_HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/VariableInteractionNetwork.cs

@@ -30 +30 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.VariableInteractionNetworks {
   [Item("VariableInteractionNetwork", "A graph representation of variables and their relationships.")]
-  [StorableClass]
+  [StorableType("CD0A2622-6872-4E61-BE01-E6AA9E41A60D")]
   public class VariableInteractionNetwork : DirectedGraph {
 
@@ -249 +250 @@
 
     [StorableConstructor]
-    public VariableInteractionNetwork(bool deserializing) : base(deserializing) { }
+    public VariableInteractionNetwork(StorableConstructorFlag _) : base(_) { }
 
     public VariableInteractionNetwork() { }
@@ -411 +412 @@
 
   [Item("VariableNetworkNode", "A graph vertex which represents a symbolic regression variable.")]
-  [StorableClass]
+  [StorableType("95E27B45-DD4B-4C32-AC5E-40A4714EA6F7")]
   public class VariableNetworkNode : Vertex<IDeepCloneable>, INetworkNode {
     public VariableNetworkNode() {
@@ -431 +432 @@
 
   [Item("FunctionNetworkNode", "A graph vertex representing a junction node.")]
-  [StorableClass]
+  [StorableType("8D4E55AC-EBF8-49BA-8361-FC51EF3BE990")]
   public class JunctionNetworkNode : Vertex<IDeepCloneable>, INetworkNode {
     public JunctionNetworkNode() {