ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/loops/ThreadPhaserJacobi.java

Comparing jsr166/src/test/loops/ThreadPhaserJacobi.java (file contents):
Revision 1.5 by jsr166, Mon Nov 2 23:55:36 2009 UTC vs.
Revision 1.9 by jsr166, Thu Jan 15 18:34:19 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7		// Barrier version of Jacobi iteration
#	Line 17 | Line 17 | public class ThreadPhaserJacobi {
17		/**
18		* The maximum submatrix length (both row-wise and column-wise)
19		* for any Segment
20	<	**/
21	<
20	>	*/
21		static final double EPSILON = 0.0001;  // convergence criterion
22
23		static int dimGran;
#	Line 39 | Line 38 | public class ThreadPhaserJacobi {
38		}
39
40		int granularity = n * n / nprocs;
41	<	dimGran = (int)(Math.sqrt(granularity));
41	>	dimGran = (int) Math.sqrt(granularity);
42
43		// allocate enough space for edges
44		int dim = n+2;
#	Line 67 | Line 66 | public class ThreadPhaserJacobi {
66		driver.compute();
67
68		long time = System.currentTimeMillis() - startTime;
69	<	double secs = ((double)time) / 1000.0;
69	>	double secs = (double) time / 1000.0;
70
71		System.out.println("Compute Time: " + secs);
72		}
#	Line 100 | Line 99 | public class ThreadPhaserJacobi {
99		barrier.register();
100		}
101
103	–
102		public void run() {
103		try {
104		double[][] a = A;
#	Line 139 | Line 137 | public class ThreadPhaserJacobi {
137
138		}
139
142	–
140		static class Driver {
141		double[][] A; // matrix to get old values from
142		double[][] B; // matrix to put new values into
#	Line 163 | Line 160 | public class ThreadPhaserJacobi {
160
161		int rows = hiRow - loRow + 1;
162		int cols = hiCol - loCol + 1;
163	<	int rblocks = Math.round((float)rows / dimGran);
164	<	int cblocks = Math.round((float)cols / dimGran);
163	>	int rblocks = Math.round((float) rows / dimGran);
164	>	int cblocks = Math.round((float) cols / dimGran);
165
166		int n = rblocks * cblocks;
167
#	Line 207 | Line 204 | public class ThreadPhaserJacobi {
204		System.out.println("Max diff after " + steps + " steps = " + maxd);
205		}
206		}
210	–
211	–
207		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines