Changeset 13218
- Timestamp:
- 11/17/15 14:19:44 (9 years ago)
- Location:
- trunk/sources
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/MultiObjectiveOptimizationSupportScript.cs ¶
r13183 r13218 30 30 [StorableClass] 31 31 public sealed class MultiObjectiveOptimizationSupportScript : OptimizationSupportScript<IMultiObjectiveOptimizationSupport>, IMultiObjectiveOptimizationSupport { 32 33 protected override string CodeTemplate {34 get { return Templates.CompiledMultiObjectiveOptimizationSupport; }35 }36 37 32 [StorableConstructor] 38 33 private MultiObjectiveOptimizationSupportScript(bool deserializing) : base(deserializing) { } 39 34 private MultiObjectiveOptimizationSupportScript(MultiObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { } 40 public MultiObjectiveOptimizationSupportScript() : base( ) { }35 public MultiObjectiveOptimizationSupportScript() : base(Templates.CompiledMultiObjectiveOptimizationSupport) { } 41 36 42 37 public override IDeepCloneable Clone(Cloner cloner) { -
TabularUnified trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/OptimizationSupportScript.cs ¶
r13183 r13218 46 46 protected OptimizationSupportScript() 47 47 : base() { 48 variableStore = new VariableStore(); 49 } 50 51 protected OptimizationSupportScript(string code) 52 : base(code) { 48 53 variableStore = new VariableStore(); 49 54 } -
TabularUnified trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/SingleObjectiveOptimizationSupportScript.cs ¶
r13183 r13218 31 31 [StorableClass] 32 32 public sealed class SingleObjectiveOptimizationSupportScript : OptimizationSupportScript<ISingleObjectiveOptimizationSupport>, ISingleObjectiveOptimizationSupport { 33 34 protected override string CodeTemplate {35 get { return Templates.CompiledSingleObjectiveOptimizationSupport; }36 }37 38 33 [StorableConstructor] 39 34 private SingleObjectiveOptimizationSupportScript(bool deserializing) : base(deserializing) { } 40 35 private SingleObjectiveOptimizationSupportScript(SingleObjectiveOptimizationSupportScript original, Cloner cloner) : base(original, cloner) { } 41 public SingleObjectiveOptimizationSupportScript() : base( ) { }36 public SingleObjectiveOptimizationSupportScript() : base(Templates.CompiledSingleObjectiveOptimizationSupport) { } 42 37 43 38 public override IDeepCloneable Clone(Cloner cloner) { -
TabularUnified trunk/sources/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinitionScript.cs ¶
r13212 r13218 31 31 public string Filename { get; set; } 32 32 33 protected override string CodeTemplate {34 get { return ScriptTemplates.CompiledMultiObjectiveProblemDefinition; }35 }36 37 33 private new IMultiObjectiveProblemDefinition CompiledProblemDefinition { 38 34 get { return (IMultiObjectiveProblemDefinition)base.CompiledProblemDefinition; } … … 41 37 [StorableConstructor] 42 38 private MultiObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { } 43 private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner) 44 : base(original, cloner) { } 45 46 public MultiObjectiveProblemDefinitionScript() { 47 Code = CodeTemplate; 48 } 39 private MultiObjectiveProblemDefinitionScript(MultiObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { } 40 public MultiObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledMultiObjectiveProblemDefinition) { } 49 41 50 42 public override IDeepCloneable Clone(Cloner cloner) { -
TabularUnified trunk/sources/HeuristicLab.Problems.Programmable/3.3/ProblemDefinitionScript.cs ¶
r12012 r13218 53 53 protected ProblemDefinitionScript() 54 54 : base() { 55 variableStore = new VariableStore(); 56 } 57 protected ProblemDefinitionScript(string code) 58 : base(code) { 55 59 variableStore = new VariableStore(); 56 60 } -
TabularUnified trunk/sources/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProblemDefinitionScript.cs ¶
r12012 r13218 32 32 public string Filename { get; set; } 33 33 34 protected override string CodeTemplate {35 get { return ScriptTemplates.CompiledSingleObjectiveProblemDefinition; }36 }37 38 34 private new ISingleObjectiveProblemDefinition CompiledProblemDefinition { 39 35 get { return (ISingleObjectiveProblemDefinition)base.CompiledProblemDefinition; } … … 43 39 private SingleObjectiveProblemDefinitionScript(bool deserializing) : base(deserializing) { } 44 40 private SingleObjectiveProblemDefinitionScript(SingleObjectiveProblemDefinitionScript original, Cloner cloner) : base(original, cloner) { } 45 public SingleObjectiveProblemDefinitionScript() 46 : base() { 47 Code = CodeTemplate; 48 } 41 public SingleObjectiveProblemDefinitionScript() : base(ScriptTemplates.CompiledSingleObjectiveProblemDefinition) { } 49 42 50 43 public override IDeepCloneable Clone(Cloner cloner) { -
TabularUnified trunk/sources/HeuristicLab.Scripting/3.3/ExecutableScript.cs ¶
r13080 r13218 52 52 executionTime = original.executionTime; 53 53 } 54 p ublicExecutableScript()54 protected ExecutableScript() 55 55 : base() { 56 56 executionTime = TimeSpan.Zero; 57 Code = CodeTemplate;58 57 } 59 p ublicExecutableScript(string code)58 protected ExecutableScript(string code) 60 59 : base(code) { 61 60 executionTime = TimeSpan.Zero; … … 85 84 timer.Elapsed -= timer_Elapsed; 86 85 timer.Stop(); 86 timer.Dispose(); 87 87 ExecutionTime += DateTime.UtcNow - lastUpdateTime; 88 88 Running = false; -
TabularUnified trunk/sources/HeuristicLab.Scripting/3.3/Script.cs ¶
r12616 r13218 37 37 namespace HeuristicLab.Scripting { 38 38 [StorableClass] 39 public class Script : NamedItem, IProgrammableItem { 40 protected virtual string CodeTemplate { 41 get { return string.Empty; } 42 } 43 39 public abstract class Script : NamedItem, IProgrammableItem { 44 40 #region Fields & Properties 45 41 public static new Image StaticItemImage { … … 77 73 compileErrors = new CompilerErrorCollection(original.compileErrors); 78 74 } 79 p ublicScript()75 protected Script() 80 76 : base("Script", "An empty script.") { 81 code = CodeTemplate;82 77 } 83 p ublicScript(string code)78 protected Script(string code) 84 79 : this() { 85 80 this.code = code; 86 }87 88 public override IDeepCloneable Clone(Cloner cloner) {89 return new Script(this, cloner);90 81 } 91 82 #endregion 92 83 93 84 #region Compilation 94 protected virtual CSharpCodeProvider CodeProvider {95 get {96 return new CSharpCodeProvider(97 new Dictionary<string, string> {98 {"CompilerVersion", "v4.0"}, // support C# 4.0 syntax99 });100 }101 }102 103 85 protected virtual CompilerResults DoCompile() { 104 86 var parameters = new CompilerParameters { … … 114 96 .ToArray()); 115 97 116 return CodeProvider.CompileAssemblyFromSource(parameters, code); 98 var codeProvider = new CSharpCodeProvider( 99 new Dictionary<string, string> { 100 { "CompilerVersion", "v4.0"} // support C# 4.0 syntax 101 }); 102 103 return codeProvider.CompileAssemblyFromSource(parameters, code); 117 104 } 118 105 -
TabularUnified trunk/sources/HeuristicLab.Scripting/3.3/Scripts/CSharp/CSharpScript.cs ¶
r13080 r13218 32 32 [StorableClass] 33 33 public class CSharpScript : ExecutableScript, IStorableContent { 34 #region Constants35 protected override string CodeTemplate { get { return ScriptTemplates.CSharpScriptTemplate; } }36 #endregion37 38 34 #region Fields & Properties 39 35 private CSharpScriptBase compiledScript; … … 56 52 } 57 53 public CSharpScript() 58 : base( ) {54 : base(ScriptTemplates.CSharpScriptTemplate) { 59 55 variableStore = new VariableStore(); 60 56 }
Note: See TracChangeset
for help on using the changeset viewer.