Context Navigation

← Previous Change
Next Change →

HeuristicLab.Operators.Views.GraphVisualization

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

: 16 edited

. (modified) (1 prop)
HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs (modified) (3 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IConnectionInfo.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IGraphVisualizationInfo.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IShapeInfo.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/IOperatorShapeInfo.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs (modified) (3 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShape.cs (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs (modified) (3 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs (modified) (1 diff)
HeuristicLab.Operators.Views.GraphVisualization/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Operators.Views.GraphVisualization/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2521_ProblemRefactoring

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
/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2892_LR-prediction-intervals (added)	merged: 15743-15744,16388
/branches/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/branches/2947_ConfigurableIndexedDataTable (added)	merged: 16148-16150,16156,16520,16524
/branches/2965_CancelablePersistence (added)	merged: 16321,16325,16433,16439
/branches/2972_PDPRowSelect (added)	merged: 16444-16445,16516-16518
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382,16389,16392,16394,16407,16415,16422,16427,16430-16431,16440-16441,16443,16446,16448-16449,16478,16491,16494,16496,16499,16501-16506,16511-16513,16519,16526-16528,16542-16543,16565,16568-16569,16571-16572,16578-16579,16584-16585,16594-16595,16619,16622-16626,16629,16631,16646,16648,16651,16656,16658-16659,16661,16668,16670,16672,16681,16700-16704,16706-16707,16716
/trunk/sources	merged: 15682-15683

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System;
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
+  [StorableType("1416F47D-BEFC-4127-AC55-971099AAD93D")]
   internal class BidirectionalLookup<TFirst, TSecond> {
     [Storable]
 …
     [StorableConstructor]
     protected BidirectionalLookup(bool deserializing) : base() { }
+    protected BidirectionalLookup(StorableConstructorFlag _) { }
     public BidirectionalLookup() {

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
+  [StorableType("92043EDD-87B0-42E9-A66F-230CC955C6D3")]
   public class ConnectionInfo : DeepCloneable, IConnectionInfo {
     [StorableConstructor]
     protected ConnectionInfo(bool deserializing) : base() { }
+    protected ConnectionInfo(StorableConstructorFlag _) { }
     protected ConnectionInfo(ConnectionInfo original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
+  [StorableType("85B8035F-C25D-4C75-A2A2-21230A08E9B2")]
   public class GraphVisualizationInfo : DeepCloneable, IGraphVisualizationInfo {
     [StorableConstructor]
     protected GraphVisualizationInfo(bool deserializing) : base() { }
+    protected GraphVisualizationInfo(StorableConstructorFlag _) { }
     protected GraphVisualizationInfo(GraphVisualizationInfo original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IConnectionInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System;
 using HeuristicLab.Common;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("3cdcae5a-9f9f-4b99-bcd7-cc9619a547d8")]
   public interface IConnectionInfo : IDeepCloneable {
     IShapeInfo From { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IGraphVisualizationInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("d6df3b9d-453c-4f85-ae4b-76c3cbcc304c")]
   public interface IGraphVisualizationInfo : IDeepCloneable, IContent {
     IShapeInfo InitialShape { get; set; }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IShapeInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Drawing;
 using HeuristicLab.Common;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("a4ab29fa-705b-4a49-8ca2-86a18b40de12")]
   public interface IShapeInfo : IDeepCloneable {
     Point Location { get; set; }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
+  [StorableType("330945A7-D7AF-42B9-91D2-06C1B00BC078")]
   public abstract class ShapeInfo : DeepCloneable, IShapeInfo {
     [StorableConstructor]
     protected ShapeInfo(bool deserializing) : base() { }
+    protected ShapeInfo(StorableConstructorFlag _) { }
     protected ShapeInfo(ShapeInfo original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj

-                      r11623
+                      r16723
     <RootNamespace>HeuristicLab.Operators.Views.GraphVisualization</RootNamespace>
     <AssemblyName>HeuristicLab.Operators.Views.GraphVisualization-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
 …
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/IOperatorShapeInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Collections.Generic;
 using System.Drawing;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("d6ae073c-ddf7-4923-abed-1b3c864ac492")]
   public interface IOperatorShapeInfo : IShapeInfo {
     bool Collapsed { get; set; }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
+  [StorableType("24376FA2-D635-4E10-85CC-FFE57C0788F9")]
   public sealed class OperatorGraphVisualizationInfo : GraphVisualizationInfo {
     [Storable]
 …
     [StorableConstructor]
+    private OperatorGraphVisualizationInfo(bool deserializing)
+      : base(deserializing) {
+    private OperatorGraphVisualizationInfo(StorableConstructorFlag _) : base(_) {
       this.operatorParameterCollectionMapping = new BidirectionalLookup<IOperator, IKeyedItemCollection<string, IParameter>>();
       this.parameterOperatorMapping = new Dictionary<IParameter, IOperator>();

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShape.cs

-                      r16692
+                      r16723
+#region License Information
+using HEAL.Attic;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Operators.Views.GraphVisualization {
+  [StorableType("5a5d76a6-607b-418b-9de1-e30ea3e85f58")]
   internal class OperatorShape {
     //21.04.2011 mkommend

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Operators.Views.GraphVisualization {
   [StorableClass]
+  [StorableType("354155F1-6C42-42D3-99CB-9290CD11649B")]
   public class OperatorShapeInfo : ShapeInfo, IOperatorShapeInfo {
     [Storable]
 …
     [StorableConstructor]
     protected OperatorShapeInfo(bool deserializing) : base(deserializing) { }
+    protected OperatorShapeInfo(StorableConstructorFlag _) : base(_) { }
     protected OperatorShapeInfo(OperatorShapeInfo original, Cloner cloner)

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic 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.

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/Plugin.cs.frame

-                      r16692
+                      r16723
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Attic", "1.0")]
   public class HeuristicLabOperatorsViewsGraphVisualizationPlugin : PluginBase {
+  }

branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization/3.3/Properties/AssemblyInfo.cs.frame

r16692	r16723
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2018 Heuristic 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.

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Operators.Views.GraphVisualization

Legend:

Download in other formats: