Changeset 15853 for trunk/HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

03/22/18 12:49:40 (7 years ago)

Author:

fbaching

Message:

#2908: Make ResourceRegressionDataDescriptor.ResourceName public to be used in external assembly
check for GetType().Assemply instead Assembly.GetExecutingAssembly() to match actual access in line 40 and to make class usable from external assemblies

Location:

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression

Files:

• ResourceRegressionDataDescriptor.cs (modified) (1 diff)
• ResourceRegressionInstanceProvider.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionDataDescriptor.cs

@@ -25 +25 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
   public abstract class ResourceRegressionDataDescriptor : RegressionDataDescriptor {
-    internal string ResourceName { get; set; }
+    public string ResourceName { get; set; }
 
     public bool CheckVariableNames(IEnumerable<string> VariableNames) {

trunk/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionInstanceProvider.cs

@@ -62 +62 @@
 
     protected virtual string GetResourceName(string fileName) {
-      return Assembly.GetExecutingAssembly().GetManifestResourceNames()
+      return GetType().Assembly.GetManifestResourceNames()
               .Where(x => Regex.Match(x, @".*\.Data\." + fileName).Success).SingleOrDefault();
     }