Changeset 5975


Ignore:
Timestamp:
04/07/11 10:31:48 (9 years ago)
Author:
mkommend
Message:

#1313: Updated view names to use spaces instead of !camelCasing.

Location:
trunk/sources
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.cs

    r5834 r5975  
    2525
    2626namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    27   [View("SupportVectorMachineModel SupportVectorsView")]
     27  [View("SVM Support Vectors")]
    2828  [Content(typeof(SupportVectorMachineModel), false)]
    2929  public partial class SupportVectorMachineModelSupportVectorsView : AsynchronousContentView {
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs

    r5834 r5975  
    2626
    2727namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    28   [View("SupportVectorMachineModel view")]
     28  [View("SVM Model")]
    2929  [Content(typeof(SupportVectorMachineModel), true)]
    3030  public partial class SupportVectorMachineModelView : AsynchronousContentView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs

    r5834 r5975  
    2727namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views {
    2828  [Content(typeof(SymbolicDiscriminantFunctionClassificationSolution), true)]
    29   [View("SymbolicDiscriminan FunctionClassificationSolution View")]
     29  [View("SymbolicDiscriminantFunctionClassificationSolution View")]
    3030  public partial class SymbolicDiscriminantFunctionClassificationSolutionView : DiscriminantFunctionClassificationSolutionView {
    3131    public SymbolicDiscriminantFunctionClassificationSolutionView() {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SymbolicDiscriminantFunctionClassificationSolution.cs

    r5818 r5975  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    23 using System.Linq;
     22using System;
    2423using HeuristicLab.Common;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;
    27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Operators;
    29 using HeuristicLab.Parameters;
     26using HeuristicLab.Optimization;
    3027using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    31 using HeuristicLab.Optimization;
    32 using System;
    3328
    3429namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification {
     
    3934  [Item(Name = "SymbolicDiscriminantFunctionClassificationSolution", Description = "Represents a symbolic classification solution (model + data) and attributes of the solution like accuracy and complexity.")]
    4035  public sealed class SymbolicDiscriminantFunctionClassificationSolution : DiscriminantFunctionClassificationSolution, ISymbolicClassificationSolution {
    41     private const string ModelLengthResultName = "ModelLength";
    42     private const string ModelDepthResultName = "ModelDepth";
     36    private const string ModelLengthResultName = "Model Length";
     37    private const string ModelDepthResultName = "Model Depth";
    4338
    4439    public new ISymbolicDiscriminantFunctionClassificationModel Model {
     
    8782      ModelLength = Model.SymbolicExpressionTree.Length;
    8883      ModelDepth = Model.SymbolicExpressionTree.Depth;
    89     }   
     84    }
    9085  }
    9186}
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

    r5914 r5975  
    3434  [Item(Name = "SymbolicRegressionSolution", Description = "Represents a symbolic regression solution (model + data) and attributes of the solution like accuracy and complexity.")]
    3535  public sealed class SymbolicRegressionSolution : RegressionSolution, ISymbolicRegressionSolution {
    36     private const string ModelLengthResultName = "ModelLength";
    37     private const string ModelDepthResultName = "ModelDepth";
     36    private const string ModelLengthResultName = "Model Length";
     37    private const string ModelDepthResultName = "Model Depth";
    3838
    3939    public new ISymbolicRegressionModel Model {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.cs

    r5834 r5975  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
    27   [View("SymbolicDataAnalysisModel GraphicalRepresentation")]
     27  [View("Graphical Representation")]
    2828  [Content(typeof(ISymbolicDataAnalysisModel), true)]
    2929  public partial class GraphicalSymbolicDataAnalysisModelView : AsynchronousContentView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs

    r5834 r5975  
    3232namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
    3333  [Content(typeof(RunCollection), false)]
    34   [View("RunCollection VariableImpacts")]
     34  [View("Variable Impacts")]
    3535  public sealed partial class RunCollectionVariableImpactView : AsynchronousContentView {
    3636    private const string variableImpactResultName = "Variable impacts";
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.cs

    r5834 r5975  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
    27   [View("SymbolicDataAnalysisModel TextualRepresentation")]
     27  [View("Textual Representation")]
    2828  [Content(typeof(ISymbolicDataAnalysisModel), false)]
    2929  public partial class TextualSymbolicDataAnalysisModelView : AsynchronousContentView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.cs

    r5834 r5975  
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Views {
    31   [View("ClassificationSolution ConfusionMatrix")]
     31  [View("Confusion Matrix")]
    3232  [Content(typeof(IClassificationSolution))]
    3333  public partial class ClassificationSolutionConfusionMatrixView : ItemView, IClassificationSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionEstimatedClassValuesView.cs

    r5834 r5975  
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Views {
    31   [View("ClassificationSolution EstimatedClassValues")]
     31  [View("Estimated Class Values")]
    3232  [Content(typeof(IClassificationSolution))]
    3333  public partial class ClassificationSolutionEstimatedClassValuesView : ItemView, IClassificationSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs

    r5834 r5975  
    3232using HeuristicLab.MainForm.WindowsForms;
    3333namespace HeuristicLab.Problems.DataAnalysis.Views {
    34   [View("DiscriminantFunctionClassificationSolution ROC Curves")]
     34  [View("ROC Curves")]
    3535  [Content(typeof(IDiscriminantFunctionClassificationSolution))]
    3636  public partial class DiscriminantFunctionClassificationRocCurvesView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionEstimatedClassValuesView.cs

    r5834 r5975  
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Views {
    31   [View("DiscriminantFunctionClassificationSolution EstimatedClassValues")]
     31  [View("Estimated Class Values")]
    3232  [Content(typeof(IDiscriminantFunctionClassificationSolution))]
    3333  public partial class DiscriminantFunctionClassificationSolutionEstimatedClassValuesView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs

    r5834 r5975  
    3232
    3333namespace HeuristicLab.Problems.DataAnalysis.Views {
    34   [View("DsicriminantFunctionClassificationSolution ThresholdView")]
     34  [View("Classification Threshold")]
    3535  [Content(typeof(IDiscriminantFunctionClassificationSolution), true)]
    3636  public sealed partial class DiscriminantFunctionClassificationSolutionThresholdView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionEstimatedClusterView.cs

    r5853 r5975  
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Views {
    31   [View("ClusteringSolution EstimatedCluster")]
     31  [View("Estimated Clusters")]
    3232  [Content(typeof(IClusteringSolution))]
    3333  public partial class ClusteringSolutionEstimatedClusterView : ItemView, IClusteringSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/ClusteringSolutionView.cs

    r5853 r5975  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Views {
    28   [View("RegressionSolution View")]
     28  [View("ClusteringSolution View")]
    2929  [Content(typeof(ClusteringSolution), true)]
    3030  public partial class ClusteringSolutionView : DataAnalysisSolutionView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionEstimatedValuesView.cs

    r5834 r5975  
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Views {
    31   [View("RegressionSolution EstimatedValues")]
     31  [View("Estimated Values")]
    3232  [Content(typeof(IRegressionSolution))]
    3333  public partial class RegressionSolutionEstimatedValuesView : ItemView, IRegressionSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

    r5834 r5975  
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Views {
    31   [View("RegressionSolution LineChart")]
     31  [View("Line Chart")]
    3232  [Content(typeof(IRegressionSolution))]
    3333  public partial class RegressionSolutionLineChartView : ItemView, IRegressionSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.cs

    r5834 r5975  
    3030
    3131namespace HeuristicLab.Problems.DataAnalysis.Views {
    32   [View("RegressionSolution ScatterPlot")]
     32  [View("Scatter Plot")]
    3333  [Content(typeof(IRegressionSolution))]
    3434  public partial class RegressionSolutionScatterPlotView : ItemView, IRegressionSolutionEvaluationView {
  • trunk/sources/HeuristicLab.Selection/3.3/NoSameMatesSelector.cs

    r5957 r5975  
    11using System;
     2using System.Collections.Generic;
    23using System.Linq;
    3 using System.Collections.Generic;
    44using System.Threading;
    55using HeuristicLab.Common;
     
    5555    [StorableConstructor]
    5656    protected NoSameMatesSelector(bool deserializing) : base(deserializing) { }
    57     protected NoSameMatesSelector(NoSameMatesSelector original, Cloner cloner) : base(original, cloner) {
     57    protected NoSameMatesSelector(NoSameMatesSelector original, Cloner cloner)
     58      : base(original, cloner) {
    5859      RegisterParameterEventHandlers();
    5960    }
     
    6263    }
    6364
    64     public NoSameMatesSelector() : base() {
     65    public NoSameMatesSelector()
     66      : base() {
    6567      #region Create parameters
    6668      Parameters.Add(new ValueParameter<ISingleObjectiveSelector>(SelectorParameterName, "The inner selection operator to select the parents.", new TournamentSelector()));
     
    8587          Parameters.Add(new ValueParameter<ISingleObjectiveSelector>(SelectorParameterName, "The inner selection operator to select the parents.", selector));
    8688        }
    87       }   
     89      }
    8890      // FixedValueParameter for quality difference percentage, max attempts, use range
    8991      if (Parameters.ContainsKey(QualityDifferencePercentageParameterName)) {
     
    153155        ScopeList parents = CurrentScope.SubScopes[1].SubScopes;
    154156
    155         for (int indexParent1 = 0, indexParent2 = 1; 
    156              indexParent1 < parents.Count - 1 && selectedParents < parentsToSelect - 1; 
     157        for (int indexParent1 = 0, indexParent2 = 1;
     158             indexParent1 < parents.Count - 1 && selectedParents < parentsToSelect - 1;
    157159             indexParent1 += 2, indexParent2 += 2) {
    158160          double qualityParent1 = ((DoubleValue)parents[indexParent1].Variables[qualityName].Value).Value;
     
    168170          }
    169171
    170           if (parentsDifferent) { 
     172          if (parentsDifferent) {
    171173            // inner selector already copied scopes, no cloning necessary here
    172174            selected[selectedParents++] = parents[indexParent1];
     
    204206      if (CopySelected.Value != true) {
    205207        CopySelected.Value = true;
    206         throw new ArgumentException(Name + ": CopySelected must always be true.");
    207       }
    208     }
    209     #endregion
    210 
    211     #region Helpers 
     208      }
     209    }
     210    #endregion
     211
     212    #region Helpers
    212213    private void ParameterizeSelector(ISingleObjectiveSelector selector) {
    213214      selector.CopySelected = new BoolValue(true); // must always be true
Note: See TracChangeset for help on using the changeset viewer.