Context Navigation

Changeset 14065

Timestamp:

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

Author:

mkommend

Message:

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

Location:

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions

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);
+    }
+  }

r13620	r14065
26	26	namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
27	27	/// <summary>
28		/// An interface which represents an ~~evaluation operator for~~ multi objective test functions.
	28	/// An interface which represents an multi objective test functions.
29	29	/// </summary>
30	30	public interface IMultiObjectiveTestFunction : INamedItem {

r14044	r14065
186	186
187	187	public void Load(MOTFData data) {
188		TestFunction = data.~~Evaluator~~;
	188	TestFunction = data.TestFunction;
189	189	}
190	190

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/MultiObjectiveTestfunctionTests
- Property svn:ignore set to
  bin
  obj

-                      r14030
+                      r14065
     <RootNamespace>MultiObjectiveTestfunctionTests</RootNamespace>
     <AssemblyName>MultiObjectiveTestfunctionTests</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
 …
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

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