Context Navigation

← Previous Change
Next Change →

HeuristicLab.Problems.LawnMower

Timestamp:

11/27/14 11:23:37 (10 years ago)

Author:

jkarder

Message:

#2116: merged r10041-r11593 from trunk into branch

Location:

branches/Breadcrumbs

Files:

: 16 edited

. (modified) (2 props)
HeuristicLab.Problems.LawnMower/3.3/BestSolutionAnalyzer.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Evaluator.cs (modified) (4 diffs)
HeuristicLab.Problems.LawnMower/3.3/Grammar.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Interpreter.cs (modified) (4 diffs)
HeuristicLab.Problems.LawnMower/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Problems.LawnMower/3.3/Problem.cs (modified) (2 diffs)
HeuristicLab.Problems.LawnMower/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Problems.LawnMower/3.3/Solution.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Symbols/Constant.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Symbols/ConstantTreeNode.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Symbols/Forward.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Symbols/Frog.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Symbols/Left.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Symbols/Prog.cs (modified) (1 diff)
HeuristicLab.Problems.LawnMower/3.3/Symbols/Sum.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/Breadcrumbs

Property svn:ignore

-                      old
+                      new
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
 …
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll

Property svn:mergeinfo changed

/branches/1721-RandomForestPersistence (added)	merged: 10321-10322
/branches/DataPreprocessing (added)	merged: 10085,10095,10134,10143-10148,10157-10169,10179-10189,10191-10194,10216-10221,10234-10260,10303-10304,10307-10308,10310-10317,10319-10320,10341-10345,10367,10369-10372,10374,10377,10380-10383,10532-10539,10542,10544,10546-10552,10554-10555,10557-10559,10571-10574,10580-10583,10585-10590,10609-10638,10657-10673,10676,10689-10719,10733-10742,10762-10766,10768-10773,10775-10786,10802-10821,10841-10849,10851-10854,10863,10866-10883,10898-10902,10904-10905,10908-10909,10911,10913-10916,10918,10921-10922,10925,10930-10935,10938-10940,10942-10952,10962,10964-10965,10967,10969-10973,10976-10982,10987,10990-10995,10997-11004,11009,11011,11037-11039,11042-11045,11064,11068,11070,11098
/branches/HLScript (added)	merged: 10331-10332,10358
/branches/LogResidualEvaluator (added)	merged: 10202-10203,10305,10482-10483
/branches/SpectralKernelForGaussianProcesses (added)	merged: 10204-10205,10473,10479
/stable	merged: 11170,11173,11175
/trunk/sources (added)	merged: 10130,10149-10150,10154,10170-10171,10173-10176,10195-10196,10212-10213,10231,10261,10273,10291-10292,10295,10298,10323-10324,10346,10348,10355,10359-10360,10362-10363,10365-10366,10368,10375,10378,10391,10401,10406-10407,10414,10417-10418,10428,10432-10433,10435,10440,10448,10453,10460,10465-10466,10469-10470,10472,10474-10477,10480,10484,10486,10488-10500,10503-10504,10506,10510-10512,10520-10523,10526,10531,10540-10541,10543,10545,10561-10566,10575-10578,10596-10597,10599,10601-10607,10639,10642-10643,10646,10651-10653,10727,10731,10745,10747,10761,10767,10774,10787-10791,10793-10794,10796,10799-10800,10826,10857-10862,10865,10885,10889,10894-10896,10924,10926-10927,10937,10941,10953,10955-10956,10958-10961,10963,10975,10983-10986,10988-10989,10996,11007-11008,11012-11014,11019,11024-11027,11031,11034-11035,11048,11050-11052,11056-11058,11060,11065-11067,11071,11074-11082,11086-11088,11091-11093,11095-11097,11099,11102,11108,11111-11117,11123-11128,11131,11135,11153,11156,11161,11163,11171-11172,11174,11176,11214,11241,11248-11251,11256,11263,11274,11280,11282-11283,11285-11287,11290,11292,11294-11296,11298,11300,11302,11306,11308-11309,11313,11315,11317,11324,11326,11330-11332,11337-11348,11352-11353,11361-11362,11364-11367,11380-11382,11384,11389,11391-11392,11394,11403-11404,11410-11411,11417-11420,11422,11426-11430,11432,11434-11437,11439-11448,11450,11453,11455-11457,11464,11466-11467,11469-11472,11474,11477-11480,11483,11494-11498,11504,11514-11515,11523-11525,11532-11533,11536,11540-11542,11544-11545,11547-11549,11555,11557,11581,11592

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/BestSolutionAnalyzer.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Evaluator.cs

-                      r9456
+                      r11594
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
   [StorableClass]
   [Item("Lawn Mower Evaluator", "Evaluator for the lawn mower demo GP problem.")]
   public class Evaluator : SingleSuccessorOperator, ISingleObjectiveEvaluator {
+  public class Evaluator : InstrumentedOperator, ISingleObjectiveEvaluator {
     private const string QualityParameterName = "Quality";
 …
       return new Evaluator(this, cloner);
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       int length = LawnLengthParameter.ActualValue.Value;
       int width = LawnWidthParameter.ActualValue.Value;
 …
       QualityParameter.ActualValue = new DoubleValue(numberOfMowedCells);
       return base.Apply();
+      return base.InstrumentedApply();
+    }
+  }

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Grammar.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Interpreter.cs

-                      r9456
+                      r11594
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
       lawn[mowerState.Position.Item1, mowerState.Position.Item2] = true;
       EvaluateLawnMowerProgram(tree.Root, mowerState, lawn, tree.Root.Subtrees.Skip(1).ToArray());
       return lawn;
+    }
 …
       } else if (node.Symbol is Frog) {
         var p = EvaluateLawnMowerProgram(node.GetSubtree(0), mowerState, lawn, adfs);
+        uint newRow = (uint)((mowerState.Position.Item1 + lawn.GetLength(0) + p.Item1 % lawn.GetLength(0)) % lawn.GetLength(0));
+        uint newCol = (uint)((mowerState.Position.Item2 + lawn.GetLength(1) + p.Item2 % lawn.GetLength(1)) % lawn.GetLength(1));
+        int x = p.Item1;
+        int y = p.Item2;
+        while (x < 0) x += lawn.GetLength(0);
+        while (y < 0) y += lawn.GetLength(1);
+        var newRow = (uint)((mowerState.Position.Item1 + x) % lawn.GetLength(0));
+        var newCol = (uint)((mowerState.Position.Item2 + y) % lawn.GetLength(1));
         mowerState.Position = new Tuple<uint, uint>(newRow, newCol);
         mowerState.Energy = mowerState.Energy - 1;
 …
                                   select adf).Single();
         // clone the function definition because we are replacing the argument nodes
         functionDefinition = (DefunTreeNode) functionDefinition.Clone();
+        functionDefinition = (DefunTreeNode)functionDefinition.Clone();
         // find the argument tree nodes and their parents in the original function definition
         // toList is necessary to prevent that newly inserted branches are iterated

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Plugin.cs.frame

-                      r10037
+                      r11594
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Problems.LawnMower {
   [Plugin("HeuristicLab.Problems.LawnMower", "Lawn mower demo problem for genetic programming", "3.3.9.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.LawnMower", "Lawn mower demo problem for genetic programming", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.LawnMower-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Problem.cs

-                      r9456
+                      r11594
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
                      new Grammar()));
       Maximization.Value = true;
+      InitializeOperators();
+      GrammarParameter.Value.MaximumFunctionDefinitions = MaxFunctionDefinitionsParameter.Value.Value;
+      GrammarParameter.Value.MaximumFunctionArguments = MaxArgumentDefinitionsParameter.Value.Value;
+      InitializeOperators();
       RegisterEventHandlers();
+    }

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Properties/AssemblyInfo.cs.frame

-                      r10037
+                      r11594
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.9.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Solution.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Symbols/Constant.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Symbols/ConstantTreeNode.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Symbols/Forward.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Symbols/Frog.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Symbols/Left.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Symbols/Prog.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/Breadcrumbs/HeuristicLab.Problems.LawnMower/3.3/Symbols/Sum.cs

r9456	r11594
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2014 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 11594 for branches/Breadcrumbs/HeuristicLab.Problems.LawnMower

Legend:

Download in other formats: