Context Navigation

← Previous Change
Next Change →

SymbolicDataAnalysisGenealogyAnalyzer.cs

Timestamp:

02/11/20 13:36:02 (5 years ago)

Author:

bburlacu

Message:

#1772: Merge trunk changes and fix all errors and compilation warnings.

Location:

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

: 3 edited

. (modified) (1 prop)
3.4/Analyzers (modified) (1 prop)
3.4/Analyzers/SymbolicDataAnalysisGenealogyAnalyzer.cs (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

Property svn:mergeinfo changed

/branches/2435-alglib_3_15/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 17034
/branches/2520_PersistenceReintegration/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16452-16454,16462,16476,16487,16529,16539,16551,16558-16559
/branches/2866_SymRegHyperbolicFunctions/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16375,16531,16654-16655
/branches/2892_LR-prediction-intervals/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16388
/branches/2915-AbsoluteSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 15944,16236-16240,16304,16306,16344-16348,16352,16355
/branches/2937_SymReg_AnalyticalQuotient/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16083
/branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16520
/branches/2965_CancelablePersistence/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16433
/branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16320,16322-16323,16326,16328,16330-16331,16364,16367,16374,16376-16377,16380,16383,16393,16403-16404
/branches/2972_PDPRowSelect/HeuristicLab.Problems.DataAnalysis.Symbolic (added)	merged: 16518
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic	merged: 16206,16213,16216,16218,16243,16252,16255,16258-16261,16263,16267,16270-16273,16276-16279,16283-16287,16289-16291,16293-16294,16296-16297,16301-16302,16305,16356,16359-16362,16365,16378-16379,16382,16389,16407,16430,16440,16478,16519,16527,16543,16565,16568,16571,16585,16623,16625-16626,16629,16656,16658,16668,16670,16672,16700,16702,16737,16740,16758,16762,16764,16768,16802,16822,16839,16858,16868,16905,16978-16981,16983,17028,17037,17076-17077,17125,17132,17180,17184,17344,17351,17402,17413

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

Property svn:ignore

old	new
1		BuidingBlocks
	1	SymbolicDataAnalysisBuildingBlockAnalyzer.cs
	2	SymbolicDataAnalysisHashBasedDiversityAnalyzer.cs

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGenealogyAnalyzer.cs

-                      r12892
+                      r17434
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 …
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [Item("SymbolicDataAnalysisGenealogyAnalyzer", "Genealogy analyzer for symbolic data analysis problems")]
   [StorableClass]
+  [StorableType("A3D2A9C6-D304-47F1-9F02-6ABA9A0F4428")]
   public class SymbolicDataAnalysisGenealogyAnalyzer : GenealogyAnalyzer<ISymbolicExpressionTree> {
     private const string EvaluatorParameterName = "Evaluator";
 …
     [StorableConstructor]
     protected SymbolicDataAnalysisGenealogyAnalyzer(bool deserializing) : base(deserializing) {
+    protected SymbolicDataAnalysisGenealogyAnalyzer(StorableConstructorFlag _) : base(_) {
+    }

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

Context Navigation

Changeset 17434 for branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGenealogyAnalyzer.cs

Legend:

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers

branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGenealogyAnalyzer.cs

Download in other formats: