Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/08/19 00:23:12 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16584, 16585,16594,16595, 16625, 16658, 16659, 16672, 16707, 16729, 16792, 16796, 16797, 16799, 16819, 16906, 16907, 16908, 16933, 16945, 16992, 16994, 16995, 16996, 16997, 17014, 17015, 17017, 17020, 17021, 17022, 17023, 17024, 17029, 17086, 17087, 17088, 17089 into stable.

Location:
stable
Files:
1 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Analysis

  • stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

    r17097 r17105  
    227227    internal DataRowHistogramAggregation? Aggregation { get; private set; }
    228228
    229     [Storable(Name = "Bins", AllowOneWay = true)]
     229    [Storable(OldName = "Bins")]
    230230    private int StorableBins { set { Bins = value; } }
    231     [Storable(Name = "ExactBins", AllowOneWay = true)]
     231    [Storable(OldName = "ExactBins")]
    232232    private bool StorableExactBins { set { ExactBins = value; } }
    233     [Storable(Name = "Aggregation", AllowOneWay = true)]
     233    [Storable(OldName = "Aggregation")]
    234234    private DataRowHistogramAggregation StorableAggregation { set { Aggregation = value; } }
    235235    #endregion

  • stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs

    r17097 r17105  
    6161    #region Backwards compatible code, remove with 3.4
    6262    // tuples are stored inefficiently
    63     [Storable(Name = "values", AllowOneWay = true)]
     63    [Storable(OldName = "values")]
    6464    private IEnumerable<Tuple<T, double>> StorableValues {
    6565      set { values = new ObservableList<Tuple<T, double>>(value); }

  • stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs

    r17097 r17105  
    107107    #region Backwards compatible code, remove with 3.4
    108108    private ObservableList<PointF> points;
    109     [Storable(Name = "points", AllowOneWay = true)]
     109    [Storable(OldName = "points")]
    110110    private ObservableList<PointF> StorablePoints {
    111111      set { points = value; }
    112112    }
    113113    private string xAxisName;
    114     [Storable(Name = "xAxisName", AllowOneWay = true)]
     114    [Storable(OldName = "xAxisName")]
    115115    private string StorableXAxisName {
    116116      set { xAxisName = value; }
    117117    }
    118118    private string yAxisName;
    119     [Storable(Name = "yAxisName", AllowOneWay = true)]
     119    [Storable(OldName = "yAxisName")]
    120120    private string StorableYAxisName {
    121121      set { yAxisName = value; }

  • stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs

    r17097 r17105  
    3333  public class ScatterPlotDataRowVisualProperties : DeepCloneable, INotifyPropertyChanged {
    3434    #region PointStyle
     35    [StorableType("45ED097C-3523-46B7-8D04-DA193833A899")]
    3536    public enum ScatterPlotDataRowPointStyle {
    3637      Circle,
    … …  
    4647    #endregion
    4748    #region
     49    [StorableType("4EFF1DC9-C74C-474C-81E4-0AF8E336438E")]
    4850    public enum ScatterPlotDataRowRegressionType {
    4951      None,

  • stable/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

    r17097 r17105  
    109109      <Private>False</Private>
    110110    </Reference>
    111     <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
    112       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    113     </Reference>
    114     <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    115       <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
    116     </Reference>
    117111    <Reference Include="System" />
    118112    <Reference Include="System.Core">
    … …  
    120114    </Reference>
    121115    <Reference Include="System.Drawing" />
    122     <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
    123       <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
    124     </Reference>
    125116    <Reference Include="System.Xml.Linq">
    126117      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    133124  </ItemGroup>
    134125  <ItemGroup>
    135     <None Include="packages.config" />
    136126    <None Include="Plugin.cs.frame" />
    137127    <Compile Include="AlleleFrequencyAnalysis\Allele.cs" />
    … …  
    271261    </BootstrapperPackage>
    272262  </ItemGroup>
    273   <ItemGroup />
     263  <ItemGroup>
     264    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     265      <SpecificVersion>False</SpecificVersion>
     266      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     267      <Private>False</Private>
     268    </Reference>
     269  </ItemGroup>
    274270  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    275271  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • stable/HeuristicLab.Analysis/3.3/Plugin.cs.frame

    r17097 r17105  
    3838  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3939  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    40   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     40  [PluginDependency("HeuristicLab.Attic", "1.0")]
    4141  public class HeuristicLabAnalysisPlugin : PluginBase {
    4242  }

  • stable/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.cs

    r17097 r17105  
    4444    #region Backwards compatible code, remove with 3.4
    4545    private ISolutionSimilarityCalculator oldSimilarityCalculator;
    46     [Storable(AllowOneWay = true, Name = "SimilarityCalculator")]
     46    [Storable(OldName = "SimilarityCalculator")]
    4747    [Obsolete]
    4848    private ISolutionSimilarityCalculator SimilarityCalculator { set { oldSimilarityCalculator = value; } }
Note: See TracChangeset for help on using the changeset viewer.