Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7810


Ignore:
Timestamp:
05/14/12 16:20:06 (13 years ago)
Author:
sforsten
Message:

#1784:

  • removed obsolete import & export methods from RegressionProblem and ClassificationProblem, because they are implemented in the base classes
  • removed unnecessary references in Problems.QuadraticAssignment.Views
Location:
branches/ProblemInstancesRegressionAndClassification
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs

    r7805 r7810  
    109109      }
    110110    }
    111 
    112     #region Import & Export
    113     public new void Load(IClassificationProblemData data) {
    114       base.Load(data);
    115     }
    116 
    117     public IClassificationProblemData Export() {
    118       if (ProblemData is IClassificationProblemData) {
    119         return ProblemData;
    120       } else {
    121         ClassificationProblemData claData = new ClassificationProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
    122         return base.Export(claData);
    123       }
    124     }
    125     #endregion
    126111  }
    127112}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

    r7805 r7810  
    110110      }
    111111    }
    112 
    113     #region Import & Export
    114     public new void Load(IClassificationProblemData data) {
    115       base.Load(data);
    116     }
    117 
    118     public IClassificationProblemData Export() {
    119       if (ProblemData is IClassificationProblemData) {
    120         return ProblemData;
    121       } else {
    122         ClassificationProblemData claData = new ClassificationProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
    123         return base.Export(claData);
    124       }
    125     }
    126     #endregion
    127112  }
    128113}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

    r7805 r7810  
    113113      }
    114114    }
    115 
    116     #region Import & Export
    117     public new void Load(IRegressionProblemData data) {
    118       base.Load(data);
    119     }
    120 
    121     public IRegressionProblemData Export() {
    122       if (ProblemData is IRegressionProblemData)
    123         return ProblemData;
    124       else {
    125         IRegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
    126         return base.Export(regData);
    127       }
    128     }
    129     #endregion
    130115  }
    131116}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

    r7805 r7810  
    113113      }
    114114    }
    115 
    116     #region Import & Export
    117     public new void Load(IRegressionProblemData data) {
    118       base.Load(data);
    119     }
    120 
    121     public IRegressionProblemData Export() {
    122       if (ProblemData is IRegressionProblemData)
    123         return ProblemData;
    124       else {
    125         IRegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
    126         return base.Export(regData);
    127       }
    128     }
    129     #endregion
    130115  }
    131116}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r7770 r7810  
    321321
    322322    #region Import & Export
    323     protected void Load(T data) {
     323    public void Load(T data) {
    324324      Name = data.Name;
    325325      Description = data.Description;
    … …  
    328328    }
    329329
    330     protected T Export(T data) {
    331       data.Name = Name;
    332       data.Description = Description;
    333       data.TrainingPartition.Start = ProblemData.TrainingPartition.Start;
    334       data.TrainingPartition.End = ProblemData.TrainingPartition.End;
    335       data.TestPartition.Start = ProblemData.TestPartition.Start;
    336       data.TestPartition.End = ProblemData.TestPartition.End;
    337       return data;
     330    public T Export() {
     331      return ProblemData;
    338332    }
    339333    #endregion

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

    r7805 r7810  
    4242      ProblemData = new ClassificationProblemData();
    4343    }
    44 
    45     #region Import & Export
    46     public new void Load(IClassificationProblemData data) {
    47       base.Load(data);
    48     }
    49 
    50     public IClassificationProblemData Export() {
    51       if (ProblemData is IClassificationProblemData) {
    52         return ProblemData;
    53       } else {
    54         ClassificationProblemData claData = new ClassificationProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
    55         return base.Export(claData);
    56       }
    57     }
    58     #endregion
    5944  }
    6045}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs

    r7770 r7810  
    9292
    9393    #region Import & Export
    94     protected void Load(T data) {
     94    public void Load(T data) {
    9595      Name = data.Name;
    9696      Description = data.Description;
    … …  
    9999    }
    100100
    101     protected T Export(T data) {
    102       data.Name = Name;
    103       data.Description = Description;
    104       data.TrainingPartition.Start = ProblemData.TrainingPartition.Start;
    105       data.TrainingPartition.End = ProblemData.TrainingPartition.End;
    106       data.TestPartition.Start = ProblemData.TestPartition.Start;
    107       data.TestPartition.End = ProblemData.TestPartition.End;
    108       return data;
     101    public T Export() {
     102      return ProblemData;
    109103    }
    110104    #endregion

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r7805 r7810  
    4242      ProblemData = new RegressionProblemData();
    4343    }
    44 
    45     #region Import & Export
    46     public new void Load(IRegressionProblemData data) {
    47       base.Load(data);
    48     }
    49 
    50     public IRegressionProblemData Export() {
    51       if (ProblemData is IRegressionProblemData) {
    52         return ProblemData;
    53       } else {
    54         RegressionProblemData regData = new RegressionProblemData(ProblemData.Dataset, ProblemData.AllowedInputVariables, ProblemData.TargetVariable);
    55         return base.Export(regData);
    56       }
    57     }
    58     #endregion
    5944  }
    6045}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/HeuristicLab.Problems.QuadraticAssignment.Views-3.3.csproj

    r7805 r7810  
    165165      <Private>False</Private>
    166166    </Reference>
    167     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4">
    168       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.dll</HintPath>
    169       <Private>False</Private>
    170     </Reference>
    171     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4">
    172       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll</HintPath>
    173       <Private>False</Private>
    174     </Reference>
    175167    <Reference Include="HeuristicLab.Problems.QuadraticAssignment-3.3">
    176168      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.QuadraticAssignment-3.3.dll</HintPath>
Note: See TracChangeset for help on using the changeset viewer.