Context Navigation

← Previous Changeset
Next Changeset →

Changeset 12524

Timestamp:

06/26/15 14:21:21 (8 years ago)

Author:

mkommend

Message:

#2276: Forgot to commit merge infos for dataset refactoring reintegration.

Location:

Files:

: 42 edited

. (modified) (1 prop)
HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
HeuristicLab.Analysis (modified) (1 prop)
HeuristicLab.Analysis.Views (modified) (1 prop)
HeuristicLab.Core (modified) (1 prop)
HeuristicLab.Data.Views/3.3 (modified) (1 prop)
HeuristicLab.Data/3.3 (modified) (1 prop)
HeuristicLab.Encodings.BinaryVectorEncoding (modified) (1 prop)
HeuristicLab.Encodings.IntegerVectorEncoding (modified) (1 prop)
HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
HeuristicLab.Encodings.RealVectorEncoding (modified) (1 prop)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (modified) (1 prop)
HeuristicLab.ExtLibs (modified) (1 prop)
HeuristicLab.Optimization (modified) (1 prop)
HeuristicLab.Optimizer (modified) (1 prop)
HeuristicLab.Persistence (modified) (1 prop)
HeuristicLab.Problems.ArtificialAnt (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
HeuristicLab.Problems.GrammaticalEvolution (modified) (1 prop)
HeuristicLab.Problems.Instances (modified) (1 prop)
HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
HeuristicLab.Problems.Instances.DataAnalysis.Views (modified) (1 prop)
HeuristicLab.Problems.Instances.TSPLIB.Views (modified) (1 prop)
HeuristicLab.Problems.LawnMower (modified) (1 prop)
HeuristicLab.Problems.QuadraticAssignment (modified) (1 prop)
HeuristicLab.Problems.QuadraticAssignment.Views (modified) (1 prop)
HeuristicLab.Problems.TestFunctions (modified) (1 prop)
HeuristicLab.Problems.TravelingSalesman.Views (modified) (1 prop)
HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
HeuristicLab.Problems.VehicleRouting.Views (modified) (1 prop)
HeuristicLab.Services.Hive (modified) (1 prop)
HeuristicLab.Services.Hive.DataAccess (modified) (1 prop)
HeuristicLab.Tests (modified) (1 prop)

trunk/sources

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources (added)

merged: 11571-11572,11584,11589,11621,11853,12031-12032,12105,12109,12141,12190,12247,12437-12438,12452-12454,12489,12505,12508

trunk/sources/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.DataAnalysis (added) merged: 11571,12031,12505
trunk/sources/HeuristicLab.Analysis
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis (added) merged: 12031,12105,12247
trunk/sources/HeuristicLab.Analysis.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Analysis.Views (added) merged: 12031,12247,12505
trunk/sources/HeuristicLab.Core
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Core (added) merged: 11571,11853,12031,12438,12505
trunk/sources/HeuristicLab.Data.Views/3.3
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Data.Views/3.3 (added) merged: 12031,12105,12247
trunk/sources/HeuristicLab.Data/3.3
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Data/3.3 (added) merged: 12031,12105,12247,12438
trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.BinaryVectorEncoding (added) merged: 12031,12438
trunk/sources/HeuristicLab.Encodings.IntegerVectorEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.IntegerVectorEncoding (added) merged: 12031
trunk/sources/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.PermutationEncoding (added) merged: 12031
trunk/sources/HeuristicLab.Encodings.RealVectorEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.RealVectorEncoding (added) merged: 12031
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (added) merged: 11571,12031,12438,12453,12505
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views (added) merged: 12031,12247
trunk/sources/HeuristicLab.ExtLibs
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.ExtLibs (added) merged: 12031,12105,12247,12505
trunk/sources/HeuristicLab.Optimization
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimization (added) merged: 12031,12105,12247,12505
trunk/sources/HeuristicLab.Optimizer
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Optimizer (added) merged: 12031,12438,12505
trunk/sources/HeuristicLab.Persistence
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Persistence (added) merged: 12031,12505
trunk/sources/HeuristicLab.Problems.ArtificialAnt
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.ArtificialAnt (added) merged: 12031,12438,12505

trunk/sources/HeuristicLab.Problems.DataAnalysis

Property svn:mergeinfo changed

/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis (added)

merged: 11571,11589,11621,12031-12032,12105,12141,12190,12437,12452-12453,12489,12505,12508

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic (added) merged: 11571,12031,12105,12109,12247,12438
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (added) merged: 11571,12031,12105,12109,12247,12438,12505
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views (added) merged: 12031,12105
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added) merged: 11571,12031,12105,12247,12438,12505
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (added) merged: 12031
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis (added) merged: 11571,12031,12438,12505
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (added) merged: 11571,12031,12105
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Views (added) merged: 11571,12031,12141,12247,12438,12505
trunk/sources/HeuristicLab.Problems.GrammaticalEvolution
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.GrammaticalEvolution (added) merged: 12031,12438,12505
trunk/sources/HeuristicLab.Problems.Instances
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances (added) merged: 12031
  /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances removed
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances.DataAnalysis (added) merged: 11571,12031,12438
trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views (added) merged: 12031
trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.Instances.TSPLIB.Views (added) merged: 12031
trunk/sources/HeuristicLab.Problems.LawnMower
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.LawnMower (added) merged: 12031,12438,12505
trunk/sources/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.QuadraticAssignment (added) merged: 12031,12105,12505
trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.QuadraticAssignment.Views (added) merged: 12031
trunk/sources/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TestFunctions (added) merged: 12031,12105,12247,12505
trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TravelingSalesman.Views (added) merged: 12031
trunk/sources/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 12031,12105,12505
trunk/sources/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 12031
trunk/sources/HeuristicLab.Services.Hive
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Hive (added) merged: 12031,12247,12505
trunk/sources/HeuristicLab.Services.Hive.DataAccess
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.Hive.DataAccess (added) merged: 12031
trunk/sources/HeuristicLab.Tests
- Property svn:mergeinfo changed
  /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Tests (added) merged: 12031,12438,12454,12505

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats:

Update cookies preferences