Context Navigation

← Previous Changeset
Next Changeset →

Changeset 6786

Timestamp:

09/16/11 12:20:31 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated missing trunk changes.

Location:

branches/GP.Grammar.Editor

Files:

: 23 deleted
: 10 edited

. (modified) (2 props)
HeuristicLab.Algorithms.DataAnalysis/3.4/RegressionWorkbench.cs (deleted)
HeuristicLab.Analysis (modified) (1 prop)
HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) (1 prop)
HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.Designer.cs (deleted)
HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs (deleted)
HeuristicLab.Optimization.Views/3.3/RunCollectionModificationEvaluatorView.Designer.cs (deleted)
HeuristicLab.Optimization.Views/3.3/RunCollectionModificationEvaluatorView.cs (deleted)
HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
HeuristicLab.Optimization/3.3/RunCollectionFuzzifier.cs (deleted)
HeuristicLab.Optimization/3.3/RunCollectionModificationEvaluator.cs (deleted)
HeuristicLab.Persistence (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs (modified) (2 diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ClassificationSolutionView.Designer.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ClassificationSolutionView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ClusteringSolutionView.Designer.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/ClusteringSolutionView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.Designer.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/DiscriminantFunctionClassificationSolutionView.Designer.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/DiscriminantFunctionClassificationSolutionView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IClassificationSolutionEvaluationView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IClusteringSolutionEvaluationView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IDiscriminantFunctionClassificationSolutionEvaluationView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IRegressionSolutionEvaluationView.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionView.Designer.cs (deleted)
HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionView.cs (deleted)
HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationCacheView.resx (deleted)
HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
HeuristicLab.Problems.VehicleRouting.Views (modified) (1 prop)
HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.resx (deleted)

Legend:

: Unmodified
: Added
: Removed

branches/GP.Grammar.Editor

Property svn:ignore

old	new
12	12	*.psess
13	13	*.vsp
	14	*.docstates

Property svn:mergeinfo changed

/branches/QAPAlgorithms (added)	merged: 6350-6351,6355,6416,6569-6570,6586,6593-6594,6610-6611,6615-6617,6627
/trunk/sources	merged: 6380,6410-6411,6413,6423-6425,6427-6430,6432,6434,6436,6438-6443,6446-6450,6455,6459-6460,6466-6468,6470-6472,6474,6476-6477,6485,6487-6488,6491,6495-6496,6498-6520,6522-6527,6529,6531-6545,6547-6555,6557-6559,6566-6568,6571-6585,6587-6592,6596-6606,6609,6612-6614,6628-6631,6633-6638,6640-6645,6648-6649,6652-6656,6661-6674,6676-6681,6684,6686-6687,6690-6695,6697,6705,6709,6718-6720,6728-6729,6732,6735,6738-6742,6745-6746,6749-6750,6754-6755,6758,6763,6765-6767,6769-6770,6774-6777,6783,6785

branches/GP.Grammar.Editor/HeuristicLab.Analysis
- Property svn:mergeinfo changed
  /branches/QAPAlgorithms/HeuristicLab.Analysis (added) merged: 6355,6569,6610-6611,6615-6616,6627
  /trunk/sources/HeuristicLab.Analysis merged: 6548,6628,6676
branches/GP.Grammar.Editor/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx
- Property svn:mergeinfo changed (with no actual effect on merging)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.PermutationEncoding

Property svn:mergeinfo changed

/branches/QAPAlgorithms/HeuristicLab.Encodings.PermutationEncoding (added)	merged: 6355,6416,6569,6611,6627
/trunk/sources/HeuristicLab.Encodings.PermutationEncoding	merged: 6507,6512,6548,6628,6648

branches/GP.Grammar.Editor/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed (with no actual effect on merging)
branches/GP.Grammar.Editor/HeuristicLab.Persistence
- Property svn:mergeinfo changed
  /branches/QAPAlgorithms/HeuristicLab.Persistence (added) merged: 6355,6569,6611,6627
  /trunk/sources/HeuristicLab.Persistence merged: 6446,6548,6628

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis

Property svn:mergeinfo changed

/branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis (added)	merged: 6355,6569,6611,6627
/trunk/sources/HeuristicLab.Problems.DataAnalysis	merged: 6411,6439-6440,6520,6548,6574,6581,6587-6590,6592,6602-6604,6606,6612-6613,6628,6635,6643,6645,6653-6654,6661,6666,6672,6738,6740,6742,6749,6776

branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionVariableImpactView.cs

-                      r6784
+                      r6786
       matrix = new DoubleMatrix(variableNamesList.Count, numberOfRuns + statictics.Count);
       matrix.SortableView = true;
-      matrix.RowNames = variableNamesList;
       matrix.ColumnNames = columnNames;
 …
         targetIndex++;
+      }
+      sortedMatrix.RowNames = sortedIndexes.Select(i => variableNamesList[i]);
       return sortedMatrix;
+    }

branches/GP.Grammar.Editor/HeuristicLab.Problems.VehicleRouting

Property svn:mergeinfo changed

/branches/QAPAlgorithms/HeuristicLab.Problems.VehicleRouting (added)	merged: 6355,6569,6611,6627
/trunk/sources/HeuristicLab.Problems.VehicleRouting	merged: 6441,6448-6450,6455,6459,6491,6522-6523,6548,6600,6628,6758

branches/GP.Grammar.Editor/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
  /branches/QAPAlgorithms/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 6355,6569,6611,6627
  /trunk/sources/HeuristicLab.Problems.VehicleRouting.Views merged: 6447,6548,6628

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

/branches/QAPAlgorithms/HeuristicLab.Analysis (added)	merged: 6355,6569,6610-6611,6615-6616,6627
/trunk/sources/HeuristicLab.Analysis	merged: 6548,6628,6676

/branches/QAPAlgorithms/HeuristicLab.Persistence (added)	merged: 6355,6569,6611,6627
/trunk/sources/HeuristicLab.Persistence	merged: 6446,6548,6628

Context Navigation

Changeset 6786

Legend:

Download in other formats: