Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/PushGP.Cli

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

Location:

branches/PushGP/HeuristicLab.PushGP/PushGP.Cli

Files:

• Program.cs (modified) (1 diff)
• Push.Cli.csproj (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/PushGP.Cli/Program.cs

@@ -3 +3 @@
 
 namespace HeuristicLab.Algorithms.PushGP.Cli {
+  using System.Collections.Generic;
+  using System.Linq;
+
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Constants;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
 
   class Program {
     static void Main(string[] args) {
-      if (args.Length == 0) return;
+      string code = null;
 
-      var code = args[0];
+      if (args.Length == 0) {
+        var lines = new List<string>();
+
+        Console.WriteLine(@"Program: ( must start with '(' and end with ')' )");
+
+        var bracesCount = 0;
+        var linesRead = 0;
+
+        while (bracesCount > 0 || lines.Count == 0 || linesRead == 0) {
+          var line = Console.ReadLine();
+          linesRead++;
+
+          if (string.IsNullOrWhiteSpace(line))
+            continue;
+
+          line = line.Trim();
+          lines.Add(line);
+
+          var openBraces = line.Count(c => c == PushEnvironment.ProgramStartSymbol);
+          var closeBraces = line.Count(c => c == PushEnvironment.ProgramEndSymbol);
+          bracesCount += openBraces - closeBraces;
+        }
+
+        code = string.Join(" ", lines);
+      } else {
+        code = args[0];
+      }
+
       EvaluateStepwise(code).Wait();
 
-      Console.ReadKey();
+      Console.WriteLine(@"Press any key to terminate...");
     }
 

branches/PushGP/HeuristicLab.PushGP/PushGP.Cli/Push.Cli.csproj

@@ -50 +50 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />