Changeset 13672 for branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Data/MISCInstanceProvider.cs

Timestamp:

03/09/16 12:44:23 (8 years ago)

Author:

bwerth

Message:

#1087 added Analyzers, reworked PFStore, added licence information, cleaned code

File:

• branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Data/MISCInstanceProvider.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Data/MISCInstanceProvider.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.Instances;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
@@ -27 +45 @@
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      var otherProviders = ApplicationManager.Manager.GetInstances <IProblemInstanceProvider<MOTFData>>().Where(x => x.Name != Name);
-
+      var otherProviders = ApplicationManager.Manager.GetInstances<IProblemInstanceProvider<MOTFData>>().Where(x => x.Equals(this));
       var evaluators = ApplicationManager.Manager.GetInstances<IMultiObjectiveTestFunction>()
-                                                 .Where(x => !handles(otherProviders,x))
+                                                 .Where(x => !handles(otherProviders, x))
                                                  .OrderBy(x => x.Name);
       return evaluators.Select(x => new MOTFDataDescriptor(x));
@@ -36 +53 @@
 
     private bool handles(IEnumerable<IProblemInstanceProvider<MOTFData>> others, IMultiObjectiveTestFunction x) {
-      foreach (var o in others) if (x.Name.StartsWith(o.Name)) return true;
+      foreach (var o in others) {
+        foreach (var instance in o.GetDataDescriptors()) {
+          if (instance.Equals(x)) return true;
+        }
+      }
       return false;
     }