• R/O
  • SSH
  • HTTPS

ea-addin-dsm: Commit


Commit MetaInfo

Revision49 (tree)
Time2010-07-17 01:52:19
Authorm-usami

Log Message

partitioning機能を、バックグラウンド処理化した。
進捗バーの動きが、あまりに飛び飛びなので対応を考える必要あり。
tearing機能のバックグラウンド処理化はまだ。

Change Summary

Incremental Difference

--- dsm/branches/version-0.5.1.0/EAAddinDSM/DSMDialog.cs (revision 48)
+++ dsm/branches/version-0.5.1.0/EAAddinDSM/DSMDialog.cs (revision 49)
@@ -219,7 +219,6 @@
219219 prog.partitioning();
220220 prog.ShowDialog();
221221 update();
222- //controller_.partitioning();
223222 }
224223
225224 /// <summary>
--- dsm/branches/version-0.5.1.0/EAAddinDSM/DSMModel.cs (revision 48)
+++ dsm/branches/version-0.5.1.0/EAAddinDSM/DSMModel.cs (revision 49)
@@ -174,7 +174,7 @@
174174
175175 dsm_ = partitionedDSM;
176176 elementList_ = newElementList;
177- update();
177+ //update();
178178 return true;
179179 }
180180
--- dsm/branches/version-0.5.1.0/EAAddinDSM/ProgressDialog.cs (revision 48)
+++ dsm/branches/version-0.5.1.0/EAAddinDSM/ProgressDialog.cs (revision 49)
@@ -76,7 +76,7 @@
7676 private void bgWorker__DoWork2(object sender, DoWorkEventArgs e)
7777 {
7878 BackgroundWorker bg = (BackgroundWorker)sender;
79- controller_.partitioning();
79+ controller_.partitioning(ref bg);
8080 }
8181
8282 private void bgWorker__ProgressChanged(object sender, ProgressChangedEventArgs e)
--- dsm/branches/version-0.5.1.0/EAAddinDSM/DSMController.cs (revision 48)
+++ dsm/branches/version-0.5.1.0/EAAddinDSM/DSMController.cs (revision 49)
@@ -25,6 +25,7 @@
2525
2626 using System;
2727 using System.Collections.Generic;
28+using System.ComponentModel;
2829 using System.Linq;
2930 using System.Text;
3031 using System.Collections;
@@ -85,12 +86,15 @@
8586 /// パーティショニング処理
8687 /// </summary>
8788 /// <returns>true:パーティショニング成功 false:失敗(未使用)</returns>
88- public bool partitioning()
89+ public bool partitioning(ref BackgroundWorker bg)
8990 {
9091 int[,] dsm = dsm_.getDSM();
9192 int[,] reach = reachabilityMatrix(dsm);
93+ bg.ReportProgress(30);
9294 ArrayList[] row = partitionRow(reach);
95+ bg.ReportProgress(60);
9396 ArrayList[] column = partitionColumn(reach);
97+ bg.ReportProgress(90);
9498 dsm_.setNewSequence(getNewSequence(row, column));
9599
96100 return true;
@@ -257,7 +261,8 @@
257261 if (dsm_.removeDependency(x, y))
258262 {
259263 // partitioningを実行
260- return partitioning();
264+ //return partitioning(ref bg);
265+ return true;
261266 }
262267 return false;
263268 }
Show on old repository browser