Context Navigation

Instances

Timestamp:

07/14/16 11:30:19 (8 years ago)

Author:

mkommend

Message:

#1087: Refactored instance providers and data descriptors for MOTF.

Location:

Files:

-                      r13672
+                      r14065
     public override MOTFData LoadData(IDataDescriptor id) {
       var descriptor = (MOTFDataDescriptor)id;
+      return new MOTFData {
+        Name = descriptor.Name,
+        Description = descriptor.Description,
+        Evaluator = descriptor.Evaluator
+      };
+      return new MOTFData(descriptor);
+    }
+  }

-                      r13988
+                      r14065
     public override MOTFData LoadData(IDataDescriptor id) {
       var descriptor = (MOTFDataDescriptor)id;
+      return new MOTFData {
+        Name = descriptor.Name,
+        Description = descriptor.Description,
+        Evaluator = descriptor.Evaluator
+      };
+      return new MOTFData(descriptor);
+    }
+  }

-                      r14030
+                      r14065
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      var otherProviders = ApplicationManager.Manager.GetInstances<IProblemInstanceProvider<MOTFData>>().Where(x => x.Equals(this));
       var evaluators = ApplicationManager.Manager.GetInstances<IMultiObjectiveTestFunction>()
                                                  .Where(x => !Handled(x))
 …
     public override MOTFData LoadData(IDataDescriptor id) {
       var descriptor = (MOTFDataDescriptor)id;
+      return new MOTFData {
+        Name = descriptor.Name,
+        Description = descriptor.Description,
+        Evaluator = descriptor.Evaluator
+      };
+      return new MOTFData(descriptor);
+    }
+  }

-                      r13672
+                      r14065
     /// The name of the instance
     /// </summary>
     public string Name { get; set; }
+    public string Name { get; private set; }
     /// <summary>
     /// Optional! The description of the instance
     /// </summary>
     public string Description { get; set; }
+    public string Description { get; private set; }
     /// <summary>
     /// The operator used for evaluations
     /// </summary>
     public IMultiObjectiveTestFunction Evaluator { get; set; }
+    public IMultiObjectiveTestFunction TestFunction { get; private set; }
+    public MOTFData(string name, string description, IMultiObjectiveTestFunction testFunction) {
+      Name = name;
+      Description = description;
+      TestFunction = testFunction;
+    }
+    internal MOTFData(MOTFDataDescriptor descriptor) {
+      Name = descriptor.Name;
+      Description = descriptor.Description;
+      TestFunction = descriptor.TestFunction;
+    }
+  }

-                      r13672
+                      r14065
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
   internal class MOTFDataDescriptor : IDataDescriptor {
     public string Name { get { return Evaluator.ItemName + " Function"; } }
+    public string Name { get { return TestFunction.ItemName + " Function"; } }
     public string Description {
       get { return Evaluator.Description; }
+      get { return TestFunction.Description; }
+    }
     internal IMultiObjectiveTestFunction Evaluator { get; private set; }
+    public IMultiObjectiveTestFunction TestFunction { get; private set; }
     public MOTFDataDescriptor(IMultiObjectiveTestFunction evaluator) {
       Evaluator = evaluator;
+    public MOTFDataDescriptor(IMultiObjectiveTestFunction testFunction) {
+      TestFunction = testFunction;
+    }
+  }

-                      r13672
+                      r14065
     public override MOTFData LoadData(IDataDescriptor id) {
       var descriptor = (MOTFDataDescriptor)id;
+      return new MOTFData {
+        Name = descriptor.Name,
+        Description = descriptor.Description,
+        Evaluator = descriptor.Evaluator
+      };
+      return new MOTFData(descriptor);
+    }
+  }

Note: See TracChangeset for help on using the changeset viewer.