Changeset 2285 for trunk/tools/CedmaImporter/Importer.cs
- Timestamp:
- 08/13/09 17:28:07 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tools/CedmaImporter/Importer.cs
r2277 r2285 9 9 using HeuristicLab.GP.StructureIdentification; 10 10 using System.Diagnostics; 11 using HeuristicLab.Modeling; 11 12 12 13 namespace CedmaImporter { … … 62 63 ImportAllModels(dirName, reader, database); 63 64 } 65 database.Disconnect(); 64 66 } 65 67 … … 90 92 string algoName = modelData[ALGORITHM_COLUMN].Trim(); 91 93 try { 92 HeuristicLab.Modeling. Model model = new HeuristicLab.Modeling.Model();94 HeuristicLab.Modeling.IAnalyzerModel model = new AnalyzerModel(); 93 95 model.TargetVariable = targetVariableName; 94 96 model.Dataset = problem.Dataset; … … 100 102 model.TestSamplesEnd = problem.TestSamplesEnd; 101 103 102 103 model.Data = ParseModel(dirName, modelData[FILENAME_COLUMN].Trim(), algoName);104 105 104 SetModelResults(model, modelData); 106 105 SetInputVariableResults(model, modelData); 107 106 107 model.Predictor = CreatePredictor(targetVariableName, dirName, modelData[FILENAME_COLUMN].Trim(), algoName); 108 108 database.Persist(model, algoName, null); 109 109 } … … 113 113 } 114 114 115 private void SetInputVariableResults(HeuristicLab.Modeling. Model model, string[] modelData) {115 private void SetInputVariableResults(HeuristicLab.Modeling.IAnalyzerModel model, string[] modelData) { 116 116 for (int i = VARIABLE_IMPACTS; i < modelData.Length; i++) { 117 117 if (!string.IsNullOrEmpty(modelData[i])) { 118 model.AddInputVariable s(inputVariables[i]);118 model.AddInputVariable(inputVariables[i]); 119 119 if (results[i] == EVALUATION_IMPACT) { 120 120 model.SetVariableEvaluationImpact(inputVariables[i], double.Parse(modelData[i])); … … 126 126 } 127 127 128 private void SetModelResults(HeuristicLab.Modeling. Model model, string[] modelData) {128 private void SetModelResults(HeuristicLab.Modeling.IAnalyzerModel model, string[] modelData) { 129 129 model.TrainingMeanSquaredError = double.Parse(modelData[TRAINING_MSE]); 130 130 model.ValidationMeanSquaredError = double.Parse(modelData[VALIDATION_MSE]); … … 148 148 } 149 149 150 private HeuristicLab. Core.IItem ParseModel(string dirName, string modelFileName, string algoName) {150 private HeuristicLab.Modeling.IPredictor CreatePredictor(string targetVariable, string dirName, string modelFileName, string algoName) { 151 151 foreach (char c in Path.GetInvalidFileNameChars()) { 152 152 modelFileName = modelFileName.Replace(c, '_'); 153 153 } 154 154 if (algoName == "SupportVectorRegression") { 155 HeuristicLab. Data.SVMModel model = new HeuristicLab.Data.SVMModel();155 HeuristicLab.SupportVectorMachines.SVMModel model = new HeuristicLab.SupportVectorMachines.SVMModel(); 156 156 model.Model = SVM.Model.Read(Path.Combine(dirName, modelFileName) + ".svm.model.txt"); 157 157 model.RangeTransform = SVM.RangeTransform.Read(Path.Combine(dirName, modelFileName) + ".svm.transform.txt"); 158 return model;158 return new HeuristicLab.SupportVectorMachines.Predictor(model, targetVariable); 159 159 } else { 160 160 SymbolicExpressionImporter sexpImporter = new SymbolicExpressionImporter(); … … 163 163 model.FunctionTree = sexpImporter.Import(reader); 164 164 } 165 return model;165 return new HeuristicLab.GP.StructureIdentification.Predictor(new HL2TreeEvaluator(), model); 166 166 } 167 167 }
Note: See TracChangeset
for help on using the changeset viewer.