Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression
- Timestamp:
- 03/28/19 16:54:20 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 22 22 #endregion 23 23 24 using System;25 using System.Collections.Generic;26 using System.Linq;27 24 using HeuristicLab.Common; 28 25 using HeuristicLab.Core; … … 33 30 using HeuristicLab.Optimization; 34 31 using HeuristicLab.Parameters; 35 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 36 33 using HeuristicLab.Problems.DataAnalysis; 37 34 using HeuristicLab.Problems.DataAnalysis.Symbolic; 38 35 using HeuristicLab.Problems.GrammaticalEvolution.Mappers; 39 using HeuristicLab.Random;40 36 41 37 namespace HeuristicLab.Problems.GrammaticalEvolution { 42 [Storable Class]38 [StorableType("3E723725-9141-4259-BB1D-BACE36657086")] 43 39 public abstract class GESymbolicDataAnalysisEvaluator<T> : SingleSuccessorOperator, 44 40 IGESymbolicDataAnalysisEvaluator<T>, ISymbolicDataAnalysisInterpreterOperator, ISymbolicDataAnalysisBoundedOperator, IStochasticOperator … … 106 102 107 103 [StorableConstructor] 108 protected GESymbolicDataAnalysisEvaluator( bool deserializing) : base(deserializing) { }104 protected GESymbolicDataAnalysisEvaluator(StorableConstructorFlag _) : base(_) { } 109 105 protected GESymbolicDataAnalysisEvaluator(GESymbolicDataAnalysisEvaluator<T> original, Cloner cloner) 110 106 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisProblem.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 34 34 using HeuristicLab.Optimization; 35 35 using HeuristicLab.Parameters; 36 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;36 using HEAL.Attic; 37 37 using HeuristicLab.PluginInfrastructure; 38 38 using HeuristicLab.Problems.DataAnalysis; … … 42 42 43 43 namespace HeuristicLab.Problems.GrammaticalEvolution { 44 [Storable Class]44 [StorableType("E31AC1E8-590D-4D65-883F-3113544B6C91")] 45 45 public abstract class GESymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>, 46 46 IGESymbolicDataAnalysisProblem, IStorableContent, … … 150 150 151 151 [StorableConstructor] 152 protected GESymbolicDataAnalysisProblem( bool deserializing) : base(deserializing) { }152 protected GESymbolicDataAnalysisProblem(StorableConstructorFlag _) : base(_) { } 153 153 [StorableHook(HookType.AfterDeserialization)] 154 154 private void AfterDeserialization() { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisSingleObjectiveEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Problems.DataAnalysis; 31 31 32 32 namespace HeuristicLab.Problems.GrammaticalEvolution { 33 [Storable Class]33 [StorableType("BEC10226-1F0C-4D42-ABDF-38E604C0B2F2")] 34 34 public abstract class GESymbolicDataAnalysisSingleObjectiveEvaluator<T> : GESymbolicDataAnalysisEvaluator<T>, IGESymbolicDataAnalysisSingleObjectiveEvaluator<T> 35 35 where T : class, IDataAnalysisProblemData { … … 44 44 #endregion 45 45 [StorableConstructor] 46 protected GESymbolicDataAnalysisSingleObjectiveEvaluator( bool deserializing) : base(deserializing) { }46 protected GESymbolicDataAnalysisSingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { } 47 47 protected GESymbolicDataAnalysisSingleObjectiveEvaluator(GESymbolicDataAnalysisSingleObjectiveEvaluator<T> original, Cloner cloner) 48 48 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisSingleObjectiveProblem.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 30 30 using HeuristicLab.Optimization; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.Problems.DataAnalysis; 34 34 using HeuristicLab.Problems.DataAnalysis.Symbolic; 35 35 36 36 namespace HeuristicLab.Problems.GrammaticalEvolution { 37 [Storable Class]37 [StorableType("27E01C21-6772-4CE5-8301-EF3102D1BB28")] 38 38 public abstract class GESymbolicDataAnalysisSingleObjectiveProblem<T, U, V> : GESymbolicDataAnalysisProblem<T, U, V>, 39 39 IGESymbolicDataAnalysisSingleObjectiveProblem … … 72 72 73 73 [StorableConstructor] 74 protected GESymbolicDataAnalysisSingleObjectiveProblem( bool deserializing) : base(deserializing) { }74 protected GESymbolicDataAnalysisSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { } 75 75 protected GESymbolicDataAnalysisSingleObjectiveProblem(GESymbolicDataAnalysisSingleObjectiveProblem<T, U, V> original, Cloner cloner) 76 76 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicExpressionGrammar.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 28 28 using HeuristicLab.Core; 29 29 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 using HeuristicLab.Problems.DataAnalysis.Symbolic; 32 32 using HeuristicLab.Random; 33 33 34 34 namespace HeuristicLab.Problems.GrammaticalEvolution { 35 [Storable Class]35 [StorableType("73D43A23-02FF-4BD8-9834-55D8A90E0FCE")] 36 36 [Item("GESymbolicExpressionGrammar", "Represents a grammar for functional expressions for grammatical evolution.")] 37 37 public class GESymbolicExpressionGrammar : SymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar { 38 38 [StorableConstructor] 39 protected GESymbolicExpressionGrammar( bool deserializing) : base(deserializing) { }39 protected GESymbolicExpressionGrammar(StorableConstructorFlag _) : base(_) { } 40 40 protected GESymbolicExpressionGrammar(GESymbolicExpressionGrammar original, Cloner cloner) : base(original, cloner) { } 41 41 public GESymbolicExpressionGrammar() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicRegressionSingleObjectiveEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 27 27 using HeuristicLab.Data; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Problems.DataAnalysis; 31 31 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression; 32 32 33 33 namespace HeuristicLab.Problems.GrammaticalEvolution { 34 [Storable Class]34 [StorableType("85880E49-DE2F-4FB4-8C1E-F1C51D862FDF")] 35 35 public class GESymbolicRegressionSingleObjectiveEvaluator : GESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>, 36 36 IGESymbolicRegressionSingleObjectiveEvaluator { … … 57 57 58 58 [StorableConstructor] 59 protected GESymbolicRegressionSingleObjectiveEvaluator( bool deserializing) : base(deserializing) { }59 protected GESymbolicRegressionSingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { } 60 60 protected GESymbolicRegressionSingleObjectiveEvaluator(GESymbolicRegressionSingleObjectiveEvaluator original, Cloner cloner) : base(original, cloner) { } 61 61 public GESymbolicRegressionSingleObjectiveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicRegressionSingleObjectiveProblem.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 28 28 using HeuristicLab.Encodings.IntegerVectorEncoding; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 using HeuristicLab.Problems.DataAnalysis; 32 32 using HeuristicLab.Problems.DataAnalysis.Symbolic; … … 36 36 [Item("Grammatical Evolution Symbolic Regression Problem (GE)", 37 37 "Represents grammatical evolution for single objective symbolic regression problems.")] 38 [Storable Class]38 [StorableType("65208F51-3181-4765-BA04-33CADBCE0826")] 39 39 [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 180)] 40 40 public class GESymbolicRegressionSingleObjectiveProblem : GESymbolicDataAnalysisSingleObjectiveProblem<IRegressionProblemData, IGESymbolicRegressionSingleObjectiveEvaluator, IIntegerVectorCreator>, … … 57 57 #endregion 58 58 [StorableConstructor] 59 protected GESymbolicRegressionSingleObjectiveProblem( bool deserializing) : base(deserializing) { }59 protected GESymbolicRegressionSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { } 60 60 protected GESymbolicRegressionSingleObjectiveProblem(GESymbolicRegressionSingleObjectiveProblem original, Cloner cloner) 61 61 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 31 31 using HeuristicLab.Problems.DataAnalysis.Symbolic; 32 32 using HeuristicLab.Problems.GrammaticalEvolution.Mappers; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GrammaticalEvolution { 35 36 [StorableType("25134297-7d7e-4d77-bd7a-25b2b10e15c1")] 36 37 public interface IGESymbolicDataAnalysisEvaluator<T> : IEvaluator 37 38 where T : class, IDataAnalysisProblemData { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisProblem.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 28 28 using HeuristicLab.Problems.DataAnalysis; 29 29 using HeuristicLab.Problems.DataAnalysis.Symbolic; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GrammaticalEvolution { 33 [StorableType("ce854ef0-6bf9-453f-8638-9db029eb01c6")] 32 34 public interface IGESymbolicDataAnalysisProblem : IDataAnalysisProblem, IHeuristicOptimizationProblem { 33 35 … … 47 49 } 48 50 51 [StorableType("763c58e2-dc9b-440d-b1d0-5b6c9524242c")] 49 52 public interface IGESymbolicDataAnalysisSingleObjectiveProblem : IGESymbolicDataAnalysisProblem, ISingleObjectiveHeuristicOptimizationProblem { } 50 53 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisSingleObjectiveEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 25 25 using HeuristicLab.Optimization; 26 26 using HeuristicLab.Problems.DataAnalysis; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GrammaticalEvolution { 30 [StorableType("52190d05-dfdd-4ebb-9a95-5cd96eb3dc7e")] 29 31 public interface IGESymbolicDataAnalysisSingleObjectiveEvaluator<T> : IGESymbolicDataAnalysisEvaluator<T>, ISingleObjectiveEvaluator 30 32 where T : class,IDataAnalysisProblemData { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisValidationAnalyzer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 26 26 using HeuristicLab.Problems.DataAnalysis; 27 27 using HeuristicLab.Problems.DataAnalysis.Symbolic; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.Problems.GrammaticalEvolution { 31 [StorableType("79deee07-e4f9-41e4-9d12-c0ab504a6b4f")] 30 32 public interface IGESymbolicDataAnalysisValidationAnalyzer<T, U> : ISymbolicDataAnalysisAnalyzer, ISymbolicDataAnalysisInterpreterOperator 31 33 where T : class,IGESymbolicDataAnalysisEvaluator<U> -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicRegressionEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 24 24 25 25 using HeuristicLab.Problems.DataAnalysis; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.Problems.GrammaticalEvolution { 29 [StorableType("d02447bf-6490-4497-8d46-18bfd65fdce9")] 28 30 public interface IGESymbolicRegressionEvaluator : IGESymbolicDataAnalysisEvaluator<IRegressionProblemData> { 29 31 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicRegressionSingleObjectiveEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic 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. … … 26 26 using HeuristicLab.Problems.DataAnalysis; 27 27 using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.Problems.GrammaticalEvolution { 31 [StorableType("7a1f572f-6ba7-4849-a6b7-57935f28215e")] 30 32 public interface IGESymbolicRegressionSingleObjectiveEvaluator : IGESymbolicRegressionEvaluator, 31 33 IGESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData> {
Note: See TracChangeset
for help on using the changeset viewer.