Changeset 2370 for trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2

Timestamp:

09/18/09 22:20:34 (15 years ago)

Author:

gkronber

Message:

Added enumerable type for model results and changed analyzer model, the database backend and the model analysis operators to use the enumerable type instead of hard-coded strings. #755 (Hard-coded strings for variable names of data-modeling results)

File:

• trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Modeling.Database.SQLServerCompact/3.2/DatabaseService.cs

@@ -60 +60 @@
       dlo.LoadWith<InputVariableResult>(ir => ir.Result);
       dlo.LoadWith<Model>(m => m.TargetVariable);
-      dlo.LoadWith<Model>(m => m.Algorithm);      
+      dlo.LoadWith<Model>(m => m.Algorithm);
       ctx.LoadOptions = dlo;
     }
@@ -110 +110 @@
 
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-        foreach (KeyValuePair<string, double> pair in model.Results) {
-          Result result = GetOrCreateResult(pair.Key);
+        foreach (KeyValuePair<ModelingResult, double> pair in model.Results) {
+          Result result = GetOrCreateResult(pair.Key.ToString());
           ctx.ModelResults.InsertOnSubmit(new ModelResult(m, result, pair.Value));
         }
@@ -127 +127 @@
 
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
-        IEnumerable<MethodInfo> inputVariableResultInfos = model.GetType().GetMethods().Where(
-          info => info.GetParameters().Count() == 1 &&
-             info.GetParameters()[0].ParameterType == typeof(string) &&
-             info.GetParameters()[0].Name == "variableName" &&
-             info.ReturnParameter.ParameterType == typeof(double) &&
-             info.Name.StartsWith("Get"));
-        foreach (MethodInfo inputVariableResultInfo in inputVariableResultInfos) {
-          Result result = GetOrCreateResult(inputVariableResultInfo.Name.Substring(3));
-          foreach (InputVariable variable in ctx.InputVariables.Where(iv => iv.Model == m)) {
-            double value = (double)inputVariableResultInfo.Invoke(model, new object[] { variable.Variable.Name });
-            ctx.InputVariableResults.InsertOnSubmit(new InputVariableResult(variable, result, value));
+        foreach (InputVariable variable in ctx.InputVariables.Where(iv => iv.Model == m)) {
+          foreach (KeyValuePair<ModelingResult, double> variableResult in model.GetVariableResults(variable.Variable.Name)) {
+            Result result = GetOrCreateResult(variableResult.Key.ToString());
+            ctx.InputVariableResults.InsertOnSubmit(new InputVariableResult(variable, result, variableResult.Value));
           }
         }
@@ -286 +279 @@
       using (ModelingDataContext ctx = new ModelingDataContext(connection)) {
         var md = from r in ctx.MetaData
-                      where r.Name == name
-                      select r;
+                 where r.Name == name
+                 select r;
         if (md.Count() == 0) {
           metadata = new MetaData(name);