Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5697


Ignore:
Timestamp:
03/15/11 17:23:15 (13 years ago)
Author:
mkommend
Message:

#1418: Added new assemblies to HL3.3 tests project and fixed minor errors regarding the visibility of the cloning and storable ctor.

Location:
branches/DataAnalysis Refactoring
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/ClassificationProblem.cs

    r5649 r5697  
    3030  public class ClassificationProblem : DataAnalysisProblem<IClassificationProblemData>, IClassificationProblem {
    3131    [StorableConstructor]
    32     public ClassificationProblem(bool deserializing) : base(deserializing) { }
    33     public ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { }
     32    protected ClassificationProblem(bool deserializing) : base(deserializing) { }
     33    protected ClassificationProblem(ClassificationProblem original, Cloner cloner) : base(original, cloner) { }
    3434    public override IDeepCloneable Clone(Cloner cloner) { return new ClassificationProblem(this, cloner); }
    3535
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/ClusteringProblem.cs

    r5649 r5697  
    3030  public class ClusteringProblem : DataAnalysisProblem<IClusteringProblemData>, IClusteringProblem {
    3131    [StorableConstructor]
    32     public ClusteringProblem(bool deserializing) : base(deserializing) { }
    33     public ClusteringProblem(ClusteringProblem original, Cloner cloner) : base(original, cloner) { }
     32    protected ClusteringProblem(bool deserializing) : base(deserializing) { }
     33    protected ClusteringProblem(ClusteringProblem original, Cloner cloner) : base(original, cloner) { }
    3434    public override IDeepCloneable Clone(Cloner cloner) { return new ClusteringProblem(this, cloner); }
    3535
  • branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis/3.4/RegressionProblem.cs

    r5649 r5697  
    3030  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem {
    3131    [StorableConstructor]
    32     public RegressionProblem(bool deserializing) : base(deserializing) { }
    33     public RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { }
     32    protected RegressionProblem(bool deserializing) : base(deserializing) { }
     33    protected RegressionProblem(RegressionProblem original, Cloner cloner) : base(original, cloner) { }
    3434    public override IDeepCloneable Clone(Cloner cloner) { return new RegressionProblem(this, cloner); }
    3535
  • branches/DataAnalysis Refactoring/HeuristicLab/3.3/Tests/CloningConstructorTest.cs

    r5306 r5697  
    3131            if (deepCloneableType.IsSealed && !constructor.IsPrivate)
    3232              errorMessage.Append(Environment.NewLine + deepCloneableType.ToString() + ": Cloning constructor must be private in sealed classes.");
    33             else if (!deepCloneableType.IsSealed && !constructor.IsFamily)
     33            else if (!deepCloneableType.IsSealed && !(constructor.IsFamily || constructor.IsPublic))
    3434              errorMessage.Append(Environment.NewLine + deepCloneableType.ToString() + ": Cloning constructor must be protected.");
    3535            break;
  • branches/DataAnalysis Refactoring/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj

    r5426 r5697  
    135135      <Name>HeuristicLab.Algorithms.DataAnalysis.Views-3.3</Name>
    136136    </ProjectReference>
     137    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.DataAnalysis.Views\3.4\HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj">
     138      <Project>{A2330DB0-413D-4424-B4E6-591118E2B9F8}</Project>
     139      <Name>HeuristicLab.Algorithms.DataAnalysis.Views-3.4</Name>
     140    </ProjectReference>
    137141    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.DataAnalysis\3.3\HeuristicLab.Algorithms.DataAnalysis-3.3.csproj">
    138142      <Project>{A8D5676D-9662-437A-B44D-ECB4046CDE12}</Project>
    139143      <Name>HeuristicLab.Algorithms.DataAnalysis-3.3</Name>
    140144    </ProjectReference>
     145    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
     146      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
     147      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
     148    </ProjectReference>
    141149    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.EvolutionStrategy\3.3\HeuristicLab.Algorithms.EvolutionStrategy-3.3.csproj">
    142150      <Project>{E0B45023-CB84-48A1-A1B7-8295B64B7BAD}</Project>
     
    243251      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3</Name>
    244252    </ProjectReference>
     253    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">
     254      <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>
     255      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>
     256    </ProjectReference>
    245257    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    246258      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    247259      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    248260    </ProjectReference>
     261    <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     262      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     263      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     264    </ProjectReference>
    249265    <ProjectReference Include="..\..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    250266      <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
     
    367383      <Name>HeuristicLab.Problems.ArtificialAnt.Views-3.3</Name>
    368384    </ProjectReference>
     385    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ArtificialAnt.Views\3.4\HeuristicLab.Problems.ArtificialAnt.Views-3.4.csproj">
     386      <Project>{3083C7AA-5AF4-4C75-BA19-B69B86E2F66A}</Project>
     387      <Name>HeuristicLab.Problems.ArtificialAnt.Views-3.4</Name>
     388    </ProjectReference>
    369389    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ArtificialAnt\3.3\HeuristicLab.Problems.ArtificialAnt-3.3.csproj">
    370390      <Project>{F5C0ECAC-EDBA-4024-872A-1F74AFCB20B4}</Project>
    371391      <Name>HeuristicLab.Problems.ArtificialAnt-3.3</Name>
    372392    </ProjectReference>
     393    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ArtificialAnt\3.4\HeuristicLab.Problems.ArtificialAnt-3.4.csproj">
     394      <Project>{0C67A033-F6D9-4237-B3CA-C033A44706BE}</Project>
     395      <Name>HeuristicLab.Problems.ArtificialAnt-3.4</Name>
     396    </ProjectReference>
    373397    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Classification.Views\3.3\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj">
    374398      <Project>{7F038E9A-B91E-4F49-8C27-D47BC86F1220}</Project>
     
    383407      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
    384408    </ProjectReference>
     409    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
     410      <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>
     411      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
     412    </ProjectReference>
     413    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
     414      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
     415      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
     416    </ProjectReference>
     417    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     418      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     419      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     420    </ProjectReference>
    385421    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Views\3.3\HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj">
    386422      <Project>{799B0B38-E384-4A17-A73C-F211EB854592}</Project>
    387423      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.3</Name>
    388424    </ProjectReference>
     425    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
     426      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
     427      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
     428    </ProjectReference>
    389429    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    390430      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    391431      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
    392432    </ProjectReference>
     433    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     434      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     435      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     436    </ProjectReference>
    393437    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj">
    394438      <Project>{1778134B-866B-4CB3-BFC0-52B2FAAA5777}</Project>
    395439      <Name>HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3</Name>
    396440    </ProjectReference>
     441    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.GP.Views\3.4\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4.csproj">
     442      <Project>{A0AF4D54-6A04-483E-A26D-97F8C1141526}</Project>
     443      <Name>HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.4</Name>
     444    </ProjectReference>
    397445    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.3\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj">
    398446      <Project>{E86E215D-E3CE-4244-978D-555D4E17AC09}</Project>
    399447      <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.3</Name>
     448    </ProjectReference>
     449    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.GP\3.4\HeuristicLab.Problems.ExternalEvaluation.GP-3.4.csproj">
     450      <Project>{B7A64A60-B538-479F-9C47-A3180C458F6C}</Project>
     451      <Name>HeuristicLab.Problems.ExternalEvaluation.GP-3.4</Name>
    400452    </ProjectReference>
    401453    <ProjectReference Include="..\..\..\HeuristicLab.Problems.ExternalEvaluation.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj">
Note: See TracChangeset for help on using the changeset viewer.