Changeset 3872 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationProblem.cs

Timestamp:

05/30/10 22:31:40 (14 years ago)

Author:

abeham

Message:

#866

• Updated ExternalEvaluationProblem
• Removed the custom crossover, manipulator, and solution creator (they're replaced with the UserDefined ones)
• Renamed all drivers to channels
• Added a client that takes the role of the previous driver
• Moved the BestScopeSolutionAnalyzer into Analysis (it's a generic operator after all)

File:

• trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationProblem.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationProblem.cs

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
@@ -48 +50 @@
 
     #region Parameters
-    private IValueParameter<IExternalEvaluationDriver> DriverParameter {
-      get { return (IValueParameter<IExternalEvaluationDriver>)Parameters["Driver"]; }
-    }
-    private IValueParameter<IExternalEvaluationProblemEvaluator> EvaluatorParameter {
+    public IValueParameter<IEvaluationServiceClient> ClientParameter {
+      get { return (IValueParameter<IEvaluationServiceClient>)Parameters["Client"]; }
+    }
+    public IValueParameter<IExternalEvaluationProblemEvaluator> EvaluatorParameter {
       get { return (IValueParameter<IExternalEvaluationProblemEvaluator>)Parameters["Evaluator"]; }
     }
@@ -112 +114 @@
       get { return OperatorsParameter.Value; }
     }
-    private BestExternalEvaluationSolutionAnalyzer BestExternalEvaluationSolutionAnalyzer {
-      get { return OperatorsParameter.Value.OfType<BestExternalEvaluationSolutionAnalyzer>().FirstOrDefault(); }
+    private BestScopeSolutionAnalyzer BestScopeSolutionAnalyzer {
+      get { return OperatorsParameter.Value.OfType<BestScopeSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -122 +124 @@
       : base() {
       ExternalEvaluator evaluator = new ExternalEvaluator();
-      ExternalEvaluationSolutionCreator solutionCreator = new ExternalEvaluationSolutionCreator();
-
-      Parameters.Add(new ValueParameter<IExternalEvaluationDriver>("Driver", "The communication driver that is used to exchange data with the external process."));
+      UserDefinedSolutionCreator solutionCreator = new UserDefinedSolutionCreator();
+
+      Parameters.Add(new ValueParameter<IEvaluationServiceClient>("Client", "The client that is used to communicate with the external application."));
       Parameters.Add(new ValueParameter<IExternalEvaluationProblemEvaluator>("Evaluator", "The evaluator that collects the values to exchange.", evaluator));
       Parameters.Add(new ValueParameter<ISolutionCreator>("SolutionCreator", "An operator to create the solution components.", solutionCreator));
@@ -168 +170 @@
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
+      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
+      ParameterizeOperators();
       OnEvaluatorChanged();
     }
     private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
-      // TODO: Following code is not yet approved behavior, but it's the best effort I can make here regarding wiring
+      ParameterizeOperators();
+    }
+    private void OperatorsParameter_ValueChanged(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    private void OperatorsParameter_Value_ItemsAdded(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    private void OperatorsParameter_Value_ItemsRemoved(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    private void OperatorsParameter_Value_CollectionReset(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    #endregion
+
+    #region Helpers
+    private void InitializeOperators() {
+      ItemList<IOperator> operators = OperatorsParameter.Value;
+      operators.Add(new BestScopeSolutionAnalyzer());
+      ParameterizeAnalyzers();
+    }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AttachEventHandlers() {
+      SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
+      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
+      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
+      OperatorsParameter.ValueChanged += new EventHandler(OperatorsParameter_ValueChanged);
+      OperatorsParameter.Value.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsAdded);
+      OperatorsParameter.Value.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsRemoved);
+      OperatorsParameter.Value.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_CollectionReset);
+    }
+    private void ParameterizeAnalyzers() {
+      BestScopeSolutionAnalyzer.ResultsParameter.ActualName = "Results";
+      BestScopeSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+      BestScopeSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
+      BestScopeSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
+      BestScopeSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+    }
+    private void ParameterizeEvaluator() {
+      Evaluator.ClientParameter.ActualName = ClientParameter.Name;
+    }
+    private void ParameterizeOperators() {
+      // This is a best effort approach to wiring
       string qualityName = Evaluator.QualityParameter.ActualName;
       foreach (IOperator op in OperatorsParameter.Value) {
@@ -182 +229 @@
       }
     }
-    private void OperatorsParameter_ValueChanged(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    private void OperatorsParameter_Value_ItemsAdded(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    private void OperatorsParameter_Value_ItemsRemoved(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    private void OperatorsParameter_Value_CollectionReset(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    #endregion
-
-    #region Helpers
-    private void InitializeOperators() {
-      ItemList<IOperator> operators = OperatorsParameter.Value;
-      operators.Add(new BestExternalEvaluationSolutionAnalyzer());
-      ParameterizeAnalyzers();
-    }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AttachEventHandlers() {
-      SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
-      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
-      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
-      OperatorsParameter.ValueChanged += new EventHandler(OperatorsParameter_ValueChanged);
-      OperatorsParameter.Value.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsAdded);
-      OperatorsParameter.Value.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsRemoved);
-      OperatorsParameter.Value.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_CollectionReset);
-    }
-    private void ParameterizeAnalyzers() {
-      BestExternalEvaluationSolutionAnalyzer.ResultsParameter.ActualName = "Results";
-      BestExternalEvaluationSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      BestExternalEvaluationSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
-      BestExternalEvaluationSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
-      BestExternalEvaluationSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-    }
-    private void ParameterizeEvaluator() {
-      Evaluator.DriverParameter.ActualName = DriverParameter.Name;
-    }
     #endregion
   }