Free cookie consent management tool by TermsFeed Policy Generator

Changeset 9748


Ignore:
Timestamp:
07/24/13 14:53:19 (9 years ago)
Author:
mkommend
Message:

#2082: Correctes spelling of MATLAB in all names and descriptions.

Location:
branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterOptimizationProblem.cs

    r9715 r9748  
    2828
    2929namespace HeuristicLab.Problems.ExternalEvaluation.Matlab {
    30   [Item("Matlab Parameter Optimization Problem", "Optimization of a parameter vector which is evaluated in Matlab.")]
     30  [Item("MATLAB Parameter Optimization Problem", "Optimization of a parameter vector which is evaluated in MATLAB.")]
    3131  [StorableClass]
    3232  [Creatable("Problems")]
    3333  public class MatlabParameterOptimizationProblem : ParameterOptimizationProblem {
    3434    private const string QualityVariableParameterName = "QualityVariableName";
    35     private const string MatlabEvaluationScriptParameterName = "MatlabEvaluationScript";
     35    private const string MatlabEvaluationScriptParameterName = "MATLABEvaluationScript";
    3636
    3737    #region parameters
     
    6565    public MatlabParameterOptimizationProblem()
    6666      : base(new MatlabParameterVectorEvaluator()) {
    67       Parameters.Add(new FixedValueParameter<StringValue>(QualityVariableParameterName, "The name of the quality variable of the SciLab script.", new StringValue("quality")));
    68       Parameters.Add(new FixedValueParameter<TextFileValue>(MatlabEvaluationScriptParameterName, "The path to the Matlab evaluation script.", new TextFileValue()));
     67      Parameters.Add(new FixedValueParameter<StringValue>(QualityVariableParameterName, "The name of the quality variable of the MATLAB script.", new StringValue("quality")));
     68      Parameters.Add(new FixedValueParameter<TextFileValue>(MatlabEvaluationScriptParameterName, "The path to the MATLAB evaluation script.", new TextFileValue()));
    6969
    70       MatlabEvaluationScript.FileDialogFilter = @"Matlab Scripts|*.m|All files|*.*";
     70      MatlabEvaluationScript.FileDialogFilter = @"MATLAB Scripts|*.m|All files|*.*";
    7171    }
    7272  }
  • branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/MatlabParameterVectorEvaluator.cs

    r9715 r9748  
    3030
    3131namespace HeuristicLab.Problems.ExternalEvaluation.Matlab {
    32   [Item("MatLabParameterVectorEvaluator", "An evaluator which takes a parameter vector and returns a quality value, calculated by a Scilab script.")]
     32  [Item("MATLABParameterVectorEvaluator", "An evaluator which takes a parameter vector and returns a quality value, calculated by a Scilab script.")]
    3333  [StorableClass]
    3434  public sealed class MatlabParameterVectorEvaluator : ParameterVectorEvaluator {
    3535    private const string QualityVariableParameterName = "QualityVariableName";
    36     private const string MatlabEvaluationScriptParameterName = "MatlabEvaluationScript";
     36    private const string MatlabEvaluationScriptParameterName = "MATLABEvaluationScript";
    3737    private const string InitializationScriptParameterName = "InitializationScript";
    3838
     
    6464    public MatlabParameterVectorEvaluator()
    6565      : base() {
    66       Parameters.Add(new LookupParameter<StringValue>(QualityVariableParameterName, "The name of the quality variable of the Matlab script."));
    67       Parameters.Add(new LookupParameter<TextFileValue>(MatlabEvaluationScriptParameterName, "The path to the Matlab evaluation script."));
    68       Parameters.Add(new FixedValueParameter<TextFileValue>(InitializationScriptParameterName, "The path to a Matlab script the should be execute before the evaluation starts.", new TextFileValue()));
    69     }
    70 
    71     [StorableHook(HookType.AfterDeserialization)]
    72     private void AfterDeserialization() {
    73       InitializeState();
     66      Parameters.Add(new LookupParameter<StringValue>(QualityVariableParameterName, "The name of the quality variable calculated in the MATLAB script."));
     67      Parameters.Add(new LookupParameter<TextFileValue>(MatlabEvaluationScriptParameterName, "The path to the MATLAB evaluation script."));
     68      Parameters.Add(new FixedValueParameter<TextFileValue>(InitializationScriptParameterName, "The path to a MATLAB script the should be execute before the evaluation starts.", new TextFileValue()));
    7469    }
    7570
     
    8984
    9085      string initScript = InitializationScript.Value;
    91       string result = matLabConnector.Execute("cd " + Path.GetDirectoryName(initScript));
     86      var directoryName = Path.GetDirectoryName(initScript);
     87      string result = matLabConnector.Execute(string.Format("cd '{0}'", directoryName));
    9288      if (!string.IsNullOrEmpty(result)) throw new InvalidOperationException(result);
    9389
     
    110106
    111107      lock (locker) {
     108        if (matLabConnector == null) InitializeState();
     109
    112110        string result;
    113111        string script = evaluationScript.Value;
    114112
    115113        if (!changedDirectory) {
    116           result = matLabConnector.Execute("cd " + Path.GetDirectoryName(script));
     114          var directoryName = Path.GetDirectoryName(script);
     115          result = matLabConnector.Execute(string.Format("cd '{0}'", directoryName));
    117116          if (!string.IsNullOrEmpty(result)) throw new InvalidOperationException(result);
    118117          changedDirectory = true;
  • branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/Plugin.cs.frame

    r9690 r9748  
    2828  /// Plugin class for HeuristicLab.Problems.ExternalEvaluation.Matlab plugin.
    2929  /// </summary>
    30   [Plugin("HeuristicLab.Problems.ExternalEvaluation.Matlab", "3.3.8.$WCREV$")]
     30  [Plugin("HeuristicLab.Problems.ExternalEvaluation.MATLAB", "3.3.8.$WCREV$")]
    3131  [PluginFile("HeuristicLab.Problems.ExternalEvaluation.Matlab-3.3.dll", PluginFileType.Assembly)]
    3232  [PluginFile("Interop.MLApp.dll",PluginFileType.Assembly)]
  • branches/HeuristicLab.ExternalEvaluation Scientific/HeuristicLab.Problems.ExternalEvaluation.Matlab/3.3/Properties/AssemblyInfo.cs.frame

    r9690 r9748  
    2727// associated with an assembly.
    2828[assembly: AssemblyTitle("HeuristicLab.Problems.ExternalEvaluation.Matlab")]
    29 [assembly: AssemblyDescription("HeuristicLab problems for real valued parameter optimization performed in Matlab.")]
     29[assembly: AssemblyDescription("HeuristicLab problems for real valued parameter optimization performed in MATLAB.")]
    3030[assembly: AssemblyConfiguration("")]
    3131[assembly: AssemblyCompany("")]
Note: See TracChangeset for help on using the changeset viewer.