Index: /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/GpdlCompiler.csproj
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/GpdlCompiler.csproj (revision 9528)
+++ /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/GpdlCompiler.csproj (revision 9528)
@@ -0,0 +1,97 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}
+ Exe
+ Properties
+ GpdlCompiler
+ GpdlCompiler
+ v4.0
+ 512
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+
+ ..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.ParallelEngine-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll
+
+
+ ..\..\..\trunk\sources\bin\HeuristicLab.SequentialEngine-3.3.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {e4ee5afb-d552-447b-8a16-6cbe7938af32}
+ HeuristicLab.Problems.GPDL-3.4
+
+
+
+
+
Index: /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/Program.cs
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/Program.cs (revision 9528)
+++ /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/Program.cs (revision 9528)
@@ -0,0 +1,164 @@
+// ATTENTION: Replace all occurences of GpdlCompiler by the compiler name!
+
+// GpdlCompiler.cs HDO, 2006-08-28
+// -----
+// Main program for compiler generated from GpdlCompiler.atg with Coco-2.
+//=====================================|========================================
+
+using System;
+using System.IO;
+
+using Lex = GPDefLex;
+using Syn = GPDefSyn;
+
+public class GpdlCompiler {
+
+ private static String NAME = "GpdlCompiler";
+ private static bool interactiveMode;
+
+ private static void Abort(String abortKind, String moduleName,
+ String methName, String descr) {
+ Console.WriteLine();
+ Console.WriteLine("*** {0} in class {1} method {2}",
+ abortKind, moduleName, methName);
+ Console.WriteLine("*** {0}", descr);
+ Console.WriteLine();
+ Console.WriteLine();
+ Console.WriteLine(NAME + " aborted");
+ Utils.Modules(Utils.ModuleAction.cleanupModule);
+ if (interactiveMode) {
+ Console.Write("type [CR] to quit");
+ string dummy = Console.ReadLine();
+ } // if
+ Environment.Exit(Utils.EXIT_FAILURE);
+ } // Abort
+
+ private static int CompileFile(String srcFileName) {
+ FileStream srcFs = null;
+ try {
+ srcFs = new FileStream(srcFileName, FileMode.Open);
+ }
+ catch (Exception) {
+ Console.WriteLine("*** file \"{0}\" not found", srcFileName);
+ return Utils.EXIT_FAILURE;
+ } // try/catch
+ try {
+ Lex.src = new StreamReader(srcFs);
+ Console.WriteLine("parsing ...");
+ Syn.Parse();
+ Lex.src.Close();
+ Lex.src.Dispose();
+ Lex.src = null;
+ if (Errors.NumOfErrors() > 0) {
+ Console.WriteLine("listing ...");
+ String lstFileName = Path.ChangeExtension(srcFileName, ".lst");
+ FileStream lstFs = null;
+ try {
+ lstFs = new FileStream(lstFileName, FileMode.Create);
+ }
+ catch (Exception) {
+ Utils.FatalError(NAME, "CompileFile", "file \"{0}\" not created", lstFileName);
+ return Utils.EXIT_FAILURE;
+ } // try/catch
+ StreamWriter lstWriter = null;
+ try {
+ lstWriter = new StreamWriter(lstFs);
+ StreamReader srcFsReader = null;
+ try { // open the source file a second time to generate the error listing
+ srcFsReader = new StreamReader(new FileStream(srcFileName, FileMode.Open));
+ lstWriter.WriteLine(NAME + " (file: \"{0}\")", srcFileName);
+ Errors.GenerateListing(srcFsReader, lstWriter, Errors.ListingShape.longListing);
+ }
+ finally {
+ srcFsReader.Close();
+ srcFsReader.Dispose();
+ } // try/finally
+ Console.WriteLine("{0} error(s) detected", Errors.NumOfErrors());
+ }
+ finally {
+ lstWriter.Close();
+ lstWriter.Dispose();
+ } // try/finally
+ } else
+ Console.WriteLine("no errors detected");
+ }
+ finally {
+ if (Lex.src != null) {
+ Lex.src.Close();
+ Lex.src.Dispose();
+ Lex.src = null;
+ } // if
+ Utils.Modules(Utils.ModuleAction.resetModule);
+ } // try/finally to make sure srcFs and srcReader are closed
+ return Utils.EXIT_SUCCESS;
+ } // CompileFile
+
+
+ public static void Main(String[] args) {
+ //-----------------------------------|----------------------------------------
+ int result = 0;
+
+ // --- install modules ---
+ Utils.InstallModule("Utils", new Utils.ModuleMethodDelegate(Utils.UtilsMethod));
+ Utils.InstallModule("Sets", new Utils.ModuleMethodDelegate(Sets.SetsMethod));
+ Utils.InstallModule("Errors", new Utils.ModuleMethodDelegate(Errors.ErrorsMethod));
+
+ Utils.InstallModule("GPDefLex", new Utils.ModuleMethodDelegate(GPDefLex.GPDefLexMethod));
+ Utils.InstallModule("GPDefSem", new Utils.ModuleMethodDelegate(GPDefSem.GPDefSemMethod));
+ Utils.InstallModule("GPDefSyn", new Utils.ModuleMethodDelegate(GPDefSyn.GPDefSynMethod));
+
+ // --- initialize modules ---
+ Utils.Modules(Utils.ModuleAction.initModule);
+
+ Errors.PushAbortMethod(new Errors.AbortMethod(Abort));
+
+ Console.WriteLine("---------------------------");
+ Console.WriteLine(" {0} Compiler {1," + (5 - NAME.Length) + "} Version X ", NAME, "");
+ Console.WriteLine(" Frontend gen. with Coco-2");
+ Console.WriteLine("---------------------------");
+ Console.WriteLine();
+
+ if (args.Length > 0) { // command line mode
+ interactiveMode = false;
+ Console.WriteLine();
+ int i = 0;
+ do {
+ Console.WriteLine("source file \"{0}\"", args[i]);
+ result = CompileFile(args[i]);
+ if (result != Utils.EXIT_SUCCESS)
+ Environment.Exit(result);
+ Console.WriteLine();
+ i++;
+ } while (i < args.Length);
+ } else { // args.Length == 0, interactive mode
+ interactiveMode = true;
+ for (; ; ) {
+ String srcFileName;
+ Utils.GetInputFileName("source file > ", out srcFileName);
+ if (srcFileName.Length > 0) {
+ result = CompileFile(srcFileName);
+ if (result != Utils.EXIT_SUCCESS)
+ Environment.Exit(result);
+ } // if
+ char answerCh;
+ do {
+ Console.WriteLine();
+ Console.Write("[c]ontinue or [q]uit > ");
+ answerCh = Char.ToUpper(Console.ReadKey().KeyChar);
+ } while (answerCh != 'C' && answerCh != 'Q');
+ if (answerCh == 'Q')
+ break;
+ else // answerCh == 'C'
+ Console.WriteLine();
+ } // for
+ } // else
+
+ Utils.Modules(Utils.ModuleAction.cleanupModule);
+ Environment.Exit(Utils.EXIT_SUCCESS);
+
+ } // Main
+
+} // GpdlCompiler
+
+// End of GpdlCompiler.cs
+//=====================================|========================================
Index: /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/Properties/AssemblyInfo.cs
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/Properties/AssemblyInfo.cs (revision 9528)
+++ /branches/HeuristicLab.Problems.GPDL/GpdlCompiler/Properties/AssemblyInfo.cs (revision 9528)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("GpdlCompiler")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("GpdlCompiler")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("f65a20bf-b5f2-4b67-a9dd-d3089ea8f74f")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Index: /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/CreateProblemMenuItem.cs
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/CreateProblemMenuItem.cs (revision 9527)
+++ /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/CreateProblemMenuItem.cs (revision 9528)
@@ -22,12 +22,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using HeuristicLab.Core;
using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Views;
using HeuristicLab.Optimizer;
Index: /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs (revision 9527)
+++ /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlEditor.cs (revision 9528)
@@ -1,13 +1,6 @@
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
using System.IO;
using System.Linq;
-using System.Text;
-using System.Windows.Forms;
using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Optimization.Views;
using HeuristicLab.Problems.Instances;
using HeuristicLab.Problems.Instances.Views;
Index: /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlProblemInstanceConsumerView.cs
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlProblemInstanceConsumerView.cs (revision 9527)
+++ /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/GpdlProblemInstanceConsumerView.cs (revision 9528)
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using HeuristicLab.Problems.GPDL.Views.Properties;
-using HeuristicLab.Problems.Instances;
-using HeuristicLab.Problems.Instances.Views;
+using HeuristicLab.Problems.Instances.Views;
namespace HeuristicLab.Problems.GPDL.Views {
Index: /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/HeuristicLab.Problems.GPDL.Views-3.4.csproj
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/HeuristicLab.Problems.GPDL.Views-3.4.csproj (revision 9527)
+++ /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.Views/3.4/HeuristicLab.Problems.GPDL.Views-3.4.csproj (revision 9528)
@@ -93,93 +93,53 @@
-
- False
- ..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll
+ False
False
..\..\..\..\trunk\sources\bin\HeuristicLab.Optimizer-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Views-3.4.dll
-
-
- ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.Instances-3.3.dll
-
-
- ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll
+ False
False
- ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.Instances.Views-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.Views-3.3.dll
+ False
@@ -241,10 +201,4 @@
-
- {e4ee5afb-d552-447b-8a16-6cbe7938af32}
- HeuristicLab.Problems.GPDL-3.4
-
-
-
GpdlEditor.cs
@@ -272,4 +226,11 @@
+
+
+
+ {E4EE5AFB-D552-447B-8A16-6CBE7938AF32}
+ HeuristicLab.Problems.GPDL-3.4
+ False
+
Index: /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.sln
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.sln (revision 9527)
+++ /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL.sln (revision 9528)
@@ -36,4 +36,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GPDL.Views-3.4", "HeuristicLab.Problems.GPDL.Views\3.4\HeuristicLab.Problems.GPDL.Views-3.4.csproj", "{3F9E665A-3DCB-49C3-8806-0E47FC48EA52}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GpdlCompiler", "GpdlCompiler\GpdlCompiler.csproj", "{C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}"
EndProject
Global
@@ -79,4 +81,12 @@
{3F9E665A-3DCB-49C3-8806-0E47FC48EA52}.Release|x86.ActiveCfg = Release|x86
{3F9E665A-3DCB-49C3-8806-0E47FC48EA52}.Release|x86.Build.0 = Release|x86
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Release|x64.ActiveCfg = Release|Any CPU
+ {C3A2E1C9-9677-4992-A1B7-7B38CDB82FEF}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Index: /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/HeuristicLab.Problems.GPDL-3.4.csproj
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/HeuristicLab.Problems.GPDL-3.4.csproj (revision 9527)
+++ /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/HeuristicLab.Problems.GPDL-3.4.csproj (revision 9528)
@@ -93,85 +93,83 @@
-
- False
- ..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Views-3.4.dll
-
-
- ..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.Instances-3.3.dll
-
-
+
+ False
+ ..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.ParallelEngine-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll
+ False
+
+
+ False
..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.DataAnalysis-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll
-
-
- c:\Program Files\HeuristicLab 3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.SequentialEngine-3.3.dll
+ False
Index: /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/ProblemGenerator.cs
===================================================================
--- /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/ProblemGenerator.cs (revision 9527)
+++ /branches/HeuristicLab.Problems.GPDL/HeuristicLab.Problems.GPDL/3.4/ProblemGenerator.cs (revision 9528)
@@ -105,4 +105,6 @@
Parameters.Add(new FixedValueParameter(""MaximumFunctionDefinitions"", new IntValue(0)));
Parameters.Add(new FixedValueParameter(""MaximumFunctionArguments"", new IntValue(0)));
+ Parameters[""MaximumFunctionDefinitions""].Hidden = true;
+ Parameters[""MaximumFunctionArguments""].Hidden = true;
Initialize();
@@ -122,10 +124,9 @@
private void InitializeOperators() {
- // Operators.AddRange(ApplicationManager.Manager.GetInstances());
- Operators.Add(new SubtreeCrossover());
- Operators.Add(new MultiSymbolicExpressionTreeManipulator());
+ Operators.AddRange(ApplicationManager.Manager.GetInstances());
Operators.Add(new SymbolicExpressionSymbolFrequencyAnalyzer());
Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
+ Operators.Add(new BestSymbolicExpressionTreeAnalyzer());
ParameterizeOperators();
}
@@ -153,4 +154,7 @@
foreach (var op in operators.OfType()) {
op.SymbolicExpressionTreeParameter.ActualName = SolutionCreator.SymbolicExpressionTreeParameter.ActualName;
+ }
+ foreach(var op in operators.OfType()) {
+ op.QualityParameter.ActualName = Evaluator.QualityParameter.Name;
}
}