Changeset 15771 for branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration

Timestamp:

02/13/18 16:56:35 (7 years ago)

Author:

bburlacu

Message:

#2895: Add solution skeleton for PushGP with genealogy analysis.

Location:

branches/2895_PushGP_GenealogyAnalysis

Files:

• . (added)
• HeuristicLab.Problems.ProgramSynthesis (copied) (copied from addons/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis)
• HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/IEnabledExpressionsConfiguration.cs (modified) (1 diff)
• HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/IReadonlyPushConfiguration.cs (modified) (1 diff)
• HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfiguration.cs (modified) (11 diffs)
• HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfigurationBase.cs (modified) (2 diffs)

branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/IEnabledExpressionsConfiguration.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 
-namespace HeuristicLab.Problems.ProgramSynthesis.Push.Configuration {
+namespace HeuristicLab.Problems.ProgramSynthesis {
   using HeuristicLab.Core;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
 
   public class EnabledExpressionsChangedEventArgs : EventArgs {

branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/IReadonlyPushConfiguration.cs

@@ -1 @@
-namespace HeuristicLab.Problems.ProgramSynthesis.Push.Configuration {
-
-  using Base.Erc;
-
-  using Stack;
-
+namespace HeuristicLab.Problems.ProgramSynthesis {
   public interface IReadOnlyPushConfiguration : IReadOnlyExpressionsConfiguration {
     int EvalPushLimit { get; }

branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfiguration.cs

@@ -1 @@
-namespace HeuristicLab.Problems.ProgramSynthesis.Push.Configuration {
+namespace HeuristicLab.Problems.ProgramSynthesis {
   using System.Collections.Generic;
 
@@ -7 +7 @@
   using HeuristicLab.Parameters;
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-  using HeuristicLab.Problems.ProgramSynthesis.Base.Erc;
 
   [StorableClass]
@@ -145 +144 @@
     }
 
-    public IValueParameter<IExpressionsConfiguration> InstructionsParameter
-    {
+    public IValueParameter<IExpressionsConfiguration> InstructionsParameter {
       get { return (IValueParameter<IExpressionsConfiguration>)Parameters[INSTRUCTIONS_PARAMETER_NAME]; }
     }
 
-    public IExpressionsConfiguration Instructions
-    {
+    public IExpressionsConfiguration Instructions {
       get { return InstructionsParameter.Value; }
       set { InstructionsParameter.Value = value; }
     }
 
-    public IValueParameter<ErcOptions> ErcOptionsParameter
-    {
+    public IValueParameter<ErcOptions> ErcOptionsParameter {
       get { return (IValueParameter<ErcOptions>)Parameters[ERC_OPTIONS_PARAMETER_NAME]; }
     }
 
-    public ErcOptions ErcOptions
-    {
+    public ErcOptions ErcOptions {
       get { return ErcOptionsParameter.Value; }
-      set
-      {
+      set {
         ErcOptionsParameter.Value = value;
       }
     }
 
-    IReadOnlyList<string> IReadOnlyExpressionsConfiguration.EnabledExpressions
-    {
-      get
-      {
+    IReadOnlyList<string> IReadOnlyExpressionsConfiguration.EnabledExpressions {
+      get {
         return enabledExpressions;
       }
     }
 
-    IReadOnlyErcOptions IReadOnlyPushConfiguration.ErcOptions
-    {
-      get
-      {
+    IReadOnlyErcOptions IReadOnlyPushConfiguration.ErcOptions {
+      get {
         return ErcOptions;
       }
@@ -195 +185 @@
     ///     is up to the calling program.
     /// </summary>
-    public IValueParameter<IntValue> EvalPushLimitParameter
-    {
+    public IValueParameter<IntValue> EvalPushLimitParameter {
       get { return (IValueParameter<IntValue>)Parameters[EVAL_PUSH_LIMIT_PARAMETER_NAME]; }
     }
 
-    public int EvalPushLimit
-    {
+    public int EvalPushLimit {
       get { return EvalPushLimitParameter.Value.Value; }
       set { EvalPushLimitParameter.Value.Value = value; }
@@ -212 +200 @@
     /// x smaller than 1 means that result is biased towards max.
     /// </summary>
-    public IValueParameter<DoubleValue> CloseBiasLevelParameter
-    {
+    public IValueParameter<DoubleValue> CloseBiasLevelParameter {
       get { return (IValueParameter<DoubleValue>)Parameters[CLOSE_BIAS_LEVEL_PARAMETER_NAME]; }
     }
 
-    public double CloseBiasLevel
-    {
+    public double CloseBiasLevel {
       get { return CloseBiasLevelParameter.Value.Value; }
       set { CloseBiasLevelParameter.Value.Value = value; }
@@ -226 +212 @@
     /// Determines the maximum of blocks which will be closed.
     /// </summary>
-    public IValueParameter<IntValue> MaxCloseParameter
-    {
+    public IValueParameter<IntValue> MaxCloseParameter {
       get { return (IValueParameter<IntValue>)Parameters[MAX_CLOSE_PARAMETER_NAME]; }
     }
 
-    public int MaxClose
-    {
+    public int MaxClose {
       get { return MaxCloseParameter.Value.Value; }
-      set
-      {
+      set {
         MaxCloseParameter.Value.Value = value;
       }
@@ -243 +226 @@
     /// This is the maximum of depth a push program can have. Expressions, which lead to exceed this limit are interpreted as NOOP.
     /// </summary>
-    public IValueParameter<IntValue> MaxDepthParameter
-    {
+    public IValueParameter<IntValue> MaxDepthParameter {
       get { return (IValueParameter<IntValue>)Parameters[MAX_DEPTH_PARAMETER_NAME]; }
     }
 
-    public int MaxDepth
-    {
+    public int MaxDepth {
       get { return MaxDepthParameter.Value.Value; }
-      set
-      {
+      set {
         MaxDepthParameter.Value.Value = value;
       }
     }
 
-    public IValueParameter<IntValue> MinProgramLengthParameter
-    {
+    public IValueParameter<IntValue> MinProgramLengthParameter {
       get { return (IValueParameter<IntValue>)Parameters[MIN_PROGRAM_LENGTH]; }
     }
 
-    public int MinProgramLength
-    {
+    public int MinProgramLength {
       get { return MinProgramLengthParameter.Value.Value; }
-      set
-      {
+      set {
         MinProgramLengthParameter.Value.Value = value;
       }
@@ -277 +254 @@
     ///     instruction.
     /// </summary>
-    public IValueParameter<IntValue> MaxProgramLengthParameter
-    {
+    public IValueParameter<IntValue> MaxProgramLengthParameter {
       get { return (IValueParameter<IntValue>)Parameters[MAX_PROGRAM_LENGTH]; }
     }
 
-    public int MaxProgramLength
-    {
+    public int MaxProgramLength {
       get { return MaxProgramLengthParameter.Value.Value; }
-      set
-      {
+      set {
         MaxProgramLengthParameter.Value.Value = value;
       }
     }
 
-    public IValueParameter<IntValue> MaxVectorLengthParameter
-    {
+    public IValueParameter<IntValue> MaxVectorLengthParameter {
       get { return (IValueParameter<IntValue>)Parameters[MAX_VECTOR_LENGTH_PARAMETER_NAME]; }
     }
 
-    public int MaxVectorLength
-    {
+    public int MaxVectorLength {
       get { return MaxVectorLengthParameter.Value.Value; }
       set { MaxVectorLengthParameter.Value.Value = value; }
@@ -305 +277 @@
     ///     The maximum number of points in an expression produced by the CODE.RAND instruction.
     /// </summary>
-    public IValueParameter<IntValue> MaxPointsInRandomExpressionParameter
-    {
+    public IValueParameter<IntValue> MaxPointsInRandomExpressionParameter {
       get { return (IValueParameter<IntValue>)Parameters[MAX_POINTS_IN_RANDOM_INSTRUCTION_PARAMETER_NAME]; }
     }
 
-    public int MaxPointsInRandomExpression
-    {
+    public int MaxPointsInRandomExpression {
       get { return MaxPointsInRandomExpressionParameter.Value.Value; }
-      set
-      {
+      set {
         MaxPointsInRandomExpressionParameter.Value.Value = value;
       }
@@ -323 +292 @@
     ///     will be pushed onto the CODE stack prior to execution.
     /// </summary>
-    public IValueParameter<BoolValue> TopLevelPushCodeParameter
-    {
+    public IValueParameter<BoolValue> TopLevelPushCodeParameter {
       get { return (IValueParameter<BoolValue>)Parameters[TOP_LEVEL_PUSH_CODE_PARAMETER_NAME]; }
     }
 
-    public bool TopLevelPushCode
-    {
+    public bool TopLevelPushCode {
       get { return TopLevelPushCodeParameter.Value.Value; }
-      set
-      {
+      set {
         TopLevelPushCodeParameter.Value.Value = value;
       }
@@ -340 +306 @@
     ///     When TRUE, the CODE stack will be popped at the end of top level calls to the interpreter. The default is FALSE.
     /// </summary>
-    public IValueParameter<BoolValue> TopLevelPopCodeParameter
-    {
+    public IValueParameter<BoolValue> TopLevelPopCodeParameter {
       get { return (IValueParameter<BoolValue>)Parameters[TOP_LEVEL_POP_CODE_PARAMETER_NAME]; }
     }
 
-    public bool TopLevelPopCode
-    {
+    public bool TopLevelPopCode {
       get { return TopLevelPopCodeParameter.Value.Value; }
-      set
-      {
+      set {
         TopLevelPopCodeParameter.Value.Value = value;
       }
     }
 
-    public IValueParameter<IntValue> MaxStringLengthParameter
-    {
+    public IValueParameter<IntValue> MaxStringLengthParameter {
       get { return (IValueParameter<IntValue>)Parameters[MAX_STRING_LENGTH_PARAMETER_NAME]; }
     }
 
-    public int MaxStringLength
-    {
+    public int MaxStringLength {
       get { return MaxStringLengthParameter.Value.Value; }
       set { MaxStringLengthParameter.Value.Value = value; }
     }
 
-    public IValueParameter<BoolValue> TopLevelPushInputArgumentsParameter
-    {
+    public IValueParameter<BoolValue> TopLevelPushInputArgumentsParameter {
       get { return (IValueParameter<BoolValue>)Parameters[TOP_LEVEL_PUSH_INPUT_ARGUMENTS]; }
     }
 
-    public bool TopLevelPushInputArguments
-    {
+    public bool TopLevelPushInputArguments {
       get { return TopLevelPushInputArgumentsParameter.Value.Value; }
       set { TopLevelPushInputArgumentsParameter.Value.Value = value; }

branches/2895_PushGP_GenealogyAnalysis/HeuristicLab.Problems.ProgramSynthesis/Push/Configuration/PushConfigurationBase.cs

@@ -3 +3 @@
 using System.Linq;
 
-namespace HeuristicLab.Problems.ProgramSynthesis.Push.Configuration {
+namespace HeuristicLab.Problems.ProgramSynthesis {
   using HeuristicLab.Common;
   using HeuristicLab.Core;
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Extensions;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
 
   [StorableClass]
@@ -53 +50 @@
     }
 
-    public IReadOnlyList<string> EnabledExpressions
-    {
+    public IReadOnlyList<string> EnabledExpressions {
       get { return enabledExpressions; }
-      set
-      {
+      set {
         var removedExpressions = enabledExpressions.ToList();
         enabledExpressions.Clear();