Context Navigation

HeuristicLab.MainForm.WindowsForms

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

r7259	r8086
50	50	//
51	51	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
52		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	52	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
53	53	this.Name = "DockSideBar";
54	54	this.Size = new System.Drawing.Size(230, 225);

r7259	r8086
104	104	//
105	105	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
106		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	106	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
107	107	this.Controls.Add(this.viewsLabel);
108	108	this.Controls.Add(this.configurationLabel);

-                      r7259
+                      r8086
       //
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.ClientSize = new System.Drawing.Size(632, 446);
       this.Controls.Add(this.viewPanel);
-      this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
       this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
       this.Name = "DockForm";

r7259	r8086
120	120	//
121	121	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
122		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	122	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
123	123	this.ClientSize = new System.Drawing.Size(624, 412);
124	124	this.Controls.Add(this.dockPanel);

r7259	r8086
51	51	//
52	52	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
53		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	53	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
54	54	this.ClientSize = new System.Drawing.Size(632, 446);
55	55	this.Controls.Add(this.viewPanel);

r7259	r8086
49	49	//
50	50	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
51		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	51	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
52	52	this.ClientSize = new System.Drawing.Size(596, 407);
53	53	this.IsMdiContainer = true;

r7259	r8086
49	49	//
50	50	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
51		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	51	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
52	52	this.ClientSize = new System.Drawing.Size(624, 412);
53	53	this.Name = "SingleDocumentMainForm";

r7259	r8086
46	46	private void InitializeComponent() {
47	47	components = new System.ComponentModel.Container();
48		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	48	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
49	49	}
50	50

r7259	r8086
38	38	//
39	39	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
40		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	40	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
41	41	this.Name = "ContentView";
42	42	this.ResumeLayout(false);

r7582	r8086
78	78	//
79	79	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
80		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	80	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
81	81	this.Controls.Add(this.panel);
82	82	this.Name = "ProgressView";

r7259	r8086
50	50	//
51	51	this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
52		this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.~~Fon~~t;
	52	this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
53	53	this.Name = "ViewBase";
54	54	this.Load += new System.EventHandler(this.View_Load);

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