Context Navigation

Changeset 16724 for branches

Timestamp:

03/28/19 17:18:28 (6 years ago)

Author:

mkommend

Message:

#2521: Corrected compilation errors in some projects.

Location:

branches/2521_ProblemRefactoring

Files:

r16723	r16724
183	183	}
184	184	}
185		[Storable~~(AllowOneWay = true)~~]
	185	[Storable]
186	186	private double[] MultiLayerPerceptronEnsembleDfdnet {
187	187	set {
…	…
197	197	}
198	198	}
199		[Storable~~(AllowOneWay = true)~~]
	199	[Storable]
200	200	private double[] MultiLayerPerceptronEnsembleNeurons {
201	201	set { mlpEnsemble.innerobj.network.neurons = value; }
202	202	}
203		[Storable~~(AllowOneWay = true)~~]
	203	[Storable]
204	204	private double[] MultiLayerPerceptronEnsembleSerializedMlp {
205	205	set {
…	…
207	207	}
208	208	}
209		[Storable~~(AllowOneWay = true)~~]
	209	[Storable]
210	210	private int[] MultiLayerPerceptronStuctinfo {
211	211	set {

-                      r16723
+                      r16724
     internal DataRowHistogramAggregation? Aggregation { get; private set; }
     [Storable(Name = "Bins", AllowOneWay = true)]
+    [Storable(Name = "Bins")]
     private int StorableBins { set { Bins = value; } }
     [Storable(Name = "ExactBins", AllowOneWay = true)]
+    [Storable(Name = "ExactBins")]
     private bool StorableExactBins { set { ExactBins = value; } }
     [Storable(Name = "Aggregation", AllowOneWay = true)]
+    [Storable(Name = "Aggregation")]
     private DataRowHistogramAggregation StorableAggregation { set { Aggregation = value; } }
     #endregion

r16723	r16724
61	61	#region Backwards compatible code, remove with 3.4
62	62	// tuples are stored inefficiently
63		[Storable(Name = "values"~~, AllowOneWay = true~~)]
	63	[Storable(Name = "values")]
64	64	private IEnumerable<Tuple<T, double>> StorableValues {
65	65	set { values = new ObservableList<Tuple<T, double>>(value); }

-                      r16723
+                      r16724
     #region Backwards compatible code, remove with 3.4
     private ObservableList<PointF> points;
     [Storable(Name = "points", AllowOneWay = true)]
+    [Storable(Name = "points")]
     private ObservableList<PointF> StorablePoints {
       set { points = value; }
+    }
     private string xAxisName;
     [Storable(Name = "xAxisName", AllowOneWay = true)]
+    [Storable(Name = "xAxisName")]
     private string StorableXAxisName {
       set { xAxisName = value; }
+    }
     private string yAxisName;
     [Storable(Name = "yAxisName", AllowOneWay = true)]
+    [Storable(Name = "yAxisName")]
     private string StorableYAxisName {
       set { yAxisName = value; }

r16723	r16724
44	44	#region Backwards compatible code, remove with 3.4
45	45	private ISolutionSimilarityCalculator oldSimilarityCalculator;
46		[Storable~~(AllowOneWay = true, Name = "SimilarityCalculator")~~]
	46	[Storable]
47	47	[Obsolete]
48	48	private ISolutionSimilarityCalculator SimilarityCalculator { set { oldSimilarityCalculator = value; } }

-                      r13376
+                      r16724
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Optimization {
   [Item("CombinedSolution", "A solution that consists of other solutions.")]
   [StorableClass]
+  [StorableType("B5ED00CB-E533-4ED6-AB2D-95BF7A654AAD")]
   public sealed class CombinedSolution : Item, ISolution {
 …
     [StorableConstructor]
     private CombinedSolution(bool deserializing) : base(deserializing) { }
+    private CombinedSolution(StorableConstructorFlag _) : base(_) { }
     private CombinedSolution(CombinedSolution original, Cloner cloner)
       : base(original, cloner) {

r16723	r16724
39	39	}
40	40
41		~~encoding.OperatorsChanged += Encoding_OperatorsChanged;~~
42	41	[StorableConstructor]
43	42	protected MultiEncodingOperator(StorableConstructorFlag _) : base(_) { }

r16723	r16724
112	112	// BackwardsCompatibility3.3
113	113	#region Backwards compatible code (remove with 3.4)
114		[Storable(~~AllowOneWay = true~~)]
	114	[Storable(Name ="algorithm")]
115	115	private IAlgorithm algorithm {
116	116	set { optimizer = value; }

r16723	r16724
84	84	// BackwardsCompatibility3.3
85	85	#region Backwards compatible code, remove with 3.4
86		[Storable(Name = "Operators"~~, AllowOneWay = true~~)]
	86	[Storable(Name = "Operators")]
87	87	private IEnumerable<IOperator> StorableOperators {
88	88	set {

r16723	r16724
125	125	// BackwardsCompatibility3.3
126	126	#region Backwards compatible code, remove with 3.4
127		[Storable~~(AllowOneWay = true)~~]
	127	[Storable]
128	128	private string AlgorithmName {
129	129	set { optimizerName = value; }

r16723	r16724
134	134	private double[,] storableData;
135	135	//name alias used to suppport backwards compatibility
136		[Storable(Name = "data"~~, AllowOneWay = true~~)]
	136	[Storable(Name = "data")]
137	137	private double[,] StorableData { set { storableData = value; } }
138	138

r16723	r16724
73	73
74	74	#region backwards compatiblity 3.3.5
75		[Storable(Name = "models"~~, AllowOneWay = true~~)]
	75	[Storable(Name = "models")]
76	76	private List<IRegressionModel> OldStorableModels {
77	77	set { models = value; }

r16723	r16724
175	175	}
176	176
177		[Storable(Name = "operators"~~, AllowOneWay = true~~)]
	177	[Storable(Name = "operators")]
178	178	private List<IOperator> StorableOperators {
179	179	set { Operators.AddRange(value); }

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