ViewVC Help

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

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

Comparing jsr166/src/test/loops/Heat.java (file contents):
Revision 1.4 by jsr166, Sat Oct 16 16:22:56 2010 UTC vs.
Revision 1.7 by jsr166, Mon Dec 5 04:08:46 2011 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		// Adapted from a cilk benchmark
#	Line 47 | Line 47 | public class Heat {
47		return;
48		}
49
50	<	ForkJoinPool g = procs == 0? new ForkJoinPool() :
50	>	ForkJoinPool g = (procs == 0) ? new ForkJoinPool() :
51		new ForkJoinPool(procs);
52
53		System.out.print("parallelism = " + g.getParallelism());
#	Line 188 | Line 188 | public class Heat {
188		}
189		}
190
191	<	edges(newMat, llb, lub,  tu + time * dt);
191	>	edges(newMat, llb, lub, tu + time * dt);
192		}
193
194

Diff Legend

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