Context Navigation

RunCollectionViews

Timestamp:

06/22/12 11:11:38 (12 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

r7469	r8086
209	209	//
210	210	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
211		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	211	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
212	212	this.BackColor = System.Drawing.SystemColors.Window;
213	213	this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

r7469	r8086
329	329	//
330	330	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
331		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	331	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
332	332	this.BackColor = System.Drawing.SystemColors.Window;
333	333	this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

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