Context Navigation

Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.DataAnalysis.Views/3.4

Timestamp:

06/22/12 11:11:38 (13 years ago)

Author:

jkarder

Message:

#1331:

synced branch with trunk
added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
similarity calculators are now parameterized by the algorithm
deleted SolutionPool2TierUpdateMethod
deleted KnapsackMultipleGuidesPathRelinker
moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
added parameter descriptions
fixed plugin references
fixed count of EvaluatedSolutions
fixed check for duplicate solutions
minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

Property svn:ignore

old	new
20	20	bin
21	21	protoc.exe
	22	_ReSharper.HeuristicLab 3.3 Tests

Property svn:mergeinfo changed

/branches/ProblemInstancesRegressionAndClassification (added)	merged: 7568-7572,7603,7605-7607,7610,7664-7667,7682-7685,7687,7698,7748-7755,7757-7759,7770-7774,7794,7805,7809-7810
/trunk/sources (added)	merged: 7795-7798,7811-7812,7814,7823,7825-7826,7828-7830,7834-7836,7841,7846-7847,7849,7851,7857,7860,7862-7863,7867,7869-7870,7872-7875,7877-7880,7885,7892,7895-7898,7900-7901,7904,7906,7908,7910,7915-7917,7919-7921,7923,7926-7928,7932,7934,7937,7943,7947-7949,7955-7957,7960-7961,7964-7967,7969,7971-7972,7974-7981,7983-7988,7990,7995-7996,7999-8000,8004,8006,8008,8011-8016,8019,8021-8023,8026,8028,8030-8031,8040,8042-8044,8046-8047,8049-8053,8055-8062,8065-8067,8069-8078,8080,8084

r7259	r8086
538	538	//
539	539	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
540		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	540	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
541	541	this.Controls.Add(this.tabControl);
542	542	this.Controls.Add(this.executionTimeTextBox);

r7259	r8086
67	67	this.AllowDrop = true;
68	68	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
69		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	69	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
70	70	this.Controls.Add(this.stringConvertibleMatrixView);
71	71	this.Name = "KMeansClusteringModelView";

r7259	r8086
35	35	[PluginDependency("HeuristicLab.Data", "3.3")]
36	36	[PluginDependency("HeuristicLab.Data.Views", "3.3")]
	37	[PluginDependency("HeuristicLab.LibSVM", "1.6.3")]
37	38	[PluginDependency("HeuristicLab.MainForm", "3.3")]
38	39	[PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]

r7259	r8086
65	65	this.AllowDrop = true;
66	66	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
67		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	67	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
68	68	this.Controls.Add(this.textBox);
69	69	this.Name = "SupportVectorMachineModelView";

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