1 diff -u raytrace1/CacheIntersectPt.java raytrace/CacheIntersectPt.java
2 --- raytrace1/CacheIntersectPt.java Wed Jun 17 22:14:38 1998
3 +++ raytrace/CacheIntersectPt.java Mon Nov 30 22:21:47 1998
5 * This source code is provided as is, without any express or implied warranty.
8 -package spec.benchmarks._205_raytrace;
9 +//package spec.benchmarks._205_raytrace;
13 diff -u raytrace1/Camera.java raytrace/Camera.java
14 --- raytrace1/Camera.java Wed Jun 17 22:14:38 1998
15 +++ raytrace/Camera.java Mon Nov 30 22:21:47 1998
17 * This source code is provided as is, without any express or implied warranty.
20 -package spec.benchmarks._205_raytrace;
21 +//package spec.benchmarks._205_raytrace;
25 diff -u raytrace1/Canvas.java raytrace/Canvas.java
26 --- raytrace1/Canvas.java Wed Jun 17 22:14:39 1998
27 +++ raytrace/Canvas.java Mon Nov 30 22:37:08 1998
29 * This source code is provided as is, without any express or implied warranty.
32 -package spec.benchmarks._205_raytrace;
33 +//package spec.benchmarks._205_raytrace;
38 int min = Math.min(GetHeight(), GetWidth());
40 for (int i = (min*min)-min; i>0; i -= min-1) {
41 - spec.io.PrintStream p = (spec.io.PrintStream)spec.harness.Context.out;
42 - if (Pixels [i] != 0) p.println('1', ""+Pixels[i]); // NS
43 + java.io.PrintStream p = (java.io.PrintStream) System.out;
44 + if (Pixels [i] != 0) p.println("1"+Pixels[i]); // NS
48 diff -u raytrace1/Color.java raytrace/Color.java
49 --- raytrace1/Color.java Wed Jun 17 22:14:40 1998
50 +++ raytrace/Color.java Mon Nov 30 22:21:47 1998
52 * This source code is provided as is, without any express or implied warranty.
55 -package spec.benchmarks._205_raytrace;
56 +//package spec.benchmarks._205_raytrace;
60 diff -u raytrace1/Face.java raytrace/Face.java
61 --- raytrace1/Face.java Wed Jun 17 22:14:41 1998
62 +++ raytrace/Face.java Mon Nov 30 22:21:47 1998
64 * This source code is provided as is, without any express or implied warranty.
67 -package spec.benchmarks._205_raytrace;
68 +//package spec.benchmarks._205_raytrace;
72 diff -u raytrace1/IntersectPt.java raytrace/IntersectPt.java
73 --- raytrace1/IntersectPt.java Wed Jun 17 22:14:42 1998
74 +++ raytrace/IntersectPt.java Mon Nov 30 22:21:47 1998
76 * This source code is provided as is, without any express or implied warranty.
79 -package spec.benchmarks._205_raytrace;
80 +//package spec.benchmarks._205_raytrace;
81 //import CacheIntersectPt;
84 diff -u raytrace1/Light.java raytrace/Light.java
85 --- raytrace1/Light.java Wed Jun 17 22:14:43 1998
86 +++ raytrace/Light.java Mon Nov 30 22:21:47 1998
88 * This source code is provided as is, without any express or implied warranty.
91 -package spec.benchmarks._205_raytrace;
92 +//package spec.benchmarks._205_raytrace;
96 diff -u raytrace1/LightNode.java raytrace/LightNode.java
97 --- raytrace1/LightNode.java Wed Jun 17 22:14:44 1998
98 +++ raytrace/LightNode.java Mon Nov 30 22:21:47 1998
100 * This source code is provided as is, without any express or implied warranty.
103 -package spec.benchmarks._205_raytrace;
104 +//package spec.benchmarks._205_raytrace;
108 diff -u raytrace1/LinkNode.java raytrace/LinkNode.java
109 --- raytrace1/LinkNode.java Wed Jun 17 22:14:45 1998
110 +++ raytrace/LinkNode.java Mon Nov 30 22:21:47 1998
112 * This source code is provided as is, without any express or implied warranty.
115 -package spec.benchmarks._205_raytrace;
116 +//package spec.benchmarks._205_raytrace;
120 diff -u raytrace1/Main.java raytrace/Main.java
121 --- raytrace1/Main.java Wed Jun 17 22:14:45 1998
122 +++ raytrace/Main.java Mon Nov 30 22:41:06 1998
124 * This source code is provided as is, without any express or implied warranty.
127 -package spec.benchmarks._205_raytrace;
128 -import spec.harness.*;
129 +//package spec.benchmarks._205_raytrace;
132 -public class Main implements SpecBenchmark {
136 static long runBenchmark( String[] args ) {
140 if( args.length == 0 ) {
141 args = new String[3];
142 - args[0] = "" + (200*spec.harness.Context.getSpeed())/100;
143 + args[0] = "" + (200 * speed)/100;
145 args[2] = "input/time-test.model";
147 diff -u raytrace1/Material.java raytrace/Material.java
148 --- raytrace1/Material.java Wed Jun 17 22:14:46 1998
149 +++ raytrace/Material.java Mon Nov 30 22:21:47 1998
151 * This source code is provided as is, without any express or implied warranty.
154 -package spec.benchmarks._205_raytrace;
155 +//package spec.benchmarks._205_raytrace;
159 diff -u raytrace1/MaterialNode.java raytrace/MaterialNode.java
160 --- raytrace1/MaterialNode.java Wed Jun 17 22:14:47 1998
161 +++ raytrace/MaterialNode.java Mon Nov 30 22:21:47 1998
163 * This source code is provided as is, without any express or implied warranty.
166 -package spec.benchmarks._205_raytrace;
167 +//package spec.benchmarks._205_raytrace;
171 diff -u raytrace1/ObjNode.java raytrace/ObjNode.java
172 --- raytrace1/ObjNode.java Wed Jun 17 22:14:49 1998
173 +++ raytrace/ObjNode.java Mon Nov 30 22:21:47 1998
175 * This source code is provided as is, without any express or implied warranty.
178 -package spec.benchmarks._205_raytrace;
179 +//package spec.benchmarks._205_raytrace;
183 diff -u raytrace1/ObjectType.java raytrace/ObjectType.java
184 --- raytrace1/ObjectType.java Wed Jun 17 22:14:48 1998
185 +++ raytrace/ObjectType.java Mon Nov 30 22:21:47 1998
187 * This source code is provided as is, without any express or implied warranty.
190 -package spec.benchmarks._205_raytrace;
191 +//package spec.benchmarks._205_raytrace;
192 //import CacheIntersectPt;
193 //import IntersectPt;
195 diff -u raytrace1/OctNode.java raytrace/OctNode.java
196 --- raytrace1/OctNode.java Wed Jun 17 22:14:50 1998
197 +++ raytrace/OctNode.java Mon Nov 30 22:21:47 1998
199 * This source code is provided as is, without any express or implied warranty.
202 -package spec.benchmarks._205_raytrace;
203 +//package spec.benchmarks._205_raytrace;
207 diff -u raytrace1/Point.java raytrace/Point.java
208 --- raytrace1/Point.java Wed Jun 17 22:14:51 1998
209 +++ raytrace/Point.java Mon Nov 30 22:21:47 1998
211 * This source code is provided as is, without any express or implied warranty.
214 -package spec.benchmarks._205_raytrace;
215 +//package spec.benchmarks._205_raytrace;
219 diff -u raytrace1/PolyTypeObj.java raytrace/PolyTypeObj.java
220 --- raytrace1/PolyTypeObj.java Wed Jun 17 22:14:53 1998
221 +++ raytrace/PolyTypeObj.java Mon Nov 30 22:21:48 1998
223 * This source code is provided as is, without any express or implied warranty.
226 -package spec.benchmarks._205_raytrace;
227 +//package spec.benchmarks._205_raytrace;
229 //import IntersectPt;
231 diff -u raytrace1/PolygonObj.java raytrace/PolygonObj.java
232 --- raytrace1/PolygonObj.java Wed Jun 17 22:14:52 1998
233 +++ raytrace/PolygonObj.java Mon Nov 30 22:21:48 1998
235 * This source code is provided as is, without any express or implied warranty.
238 -package spec.benchmarks._205_raytrace;
239 +//package spec.benchmarks._205_raytrace;
240 //import IntersectPt;
243 diff -u raytrace1/Ray.java raytrace/Ray.java
244 --- raytrace1/Ray.java Wed Jun 17 22:14:54 1998
245 +++ raytrace/Ray.java Mon Nov 30 22:21:48 1998
247 * This source code is provided as is, without any express or implied warranty.
250 -package spec.benchmarks._205_raytrace;
251 +//package spec.benchmarks._205_raytrace;
255 diff -u raytrace1/RayTracer.java raytrace/RayTracer.java
256 --- raytrace1/RayTracer.java Wed Jun 17 22:14:55 1998
257 +++ raytrace/RayTracer.java Tue Nov 26 09:00:21 2002
259 * This source code is provided as is, without any express or implied warranty.
262 -package spec.benchmarks._205_raytrace;
263 +//package spec.benchmarks._205_raytrace;
265 -import spec.harness.*;
273 - if (Context.getVerify()) {
274 - canvas.WriteDiag();
276 + canvas.WriteDiag();
280 diff -u raytrace1/Scene.java raytrace/Scene.java
281 --- raytrace1/Scene.java Wed Jun 17 22:14:56 1998
282 +++ raytrace/Scene.java Mon Nov 30 22:29:58 1998
284 * This source code is provided as is, without any express or implied warranty.
287 -package spec.benchmarks._205_raytrace;
288 +//package spec.benchmarks._205_raytrace;
293 int numObj = 0, ObjID = 0;
296 - infile = new DataInputStream(new BufferedInputStream( new spec.io.FileInputStream(filename) ));
297 + infile = new DataInputStream(new BufferedInputStream( new java.io.FileInputStream(filename) ));
302 int xstart = section * width/nsections;
303 int xend = xstart + width/nsections;
305 -spec.harness.Context.out.println( "+"+xstart + " to " + (xend-1) + " by " + canvas.GetHeight() );
306 +System.out.println( "+"+xstart + " to " + (xend-1) + " by " + canvas.GetHeight() );
308 for (ypixel = 0 ; ypixel < canvas.GetHeight(); ypixel++) {
309 current = new Point(base);
314 -spec.harness.Context.out.println( "-"+xstart + " to " + (xend-1) + " by " + canvas.GetHeight() );
315 +System.out.println( "-"+xstart + " to " + (xend-1) + " by " + canvas.GetHeight() );
319 diff -u raytrace1/SphereObj.java raytrace/SphereObj.java
320 --- raytrace1/SphereObj.java Wed Jun 17 22:14:57 1998
321 +++ raytrace/SphereObj.java Mon Nov 30 22:21:48 1998
323 * This source code is provided as is, without any express or implied warranty.
326 -package spec.benchmarks._205_raytrace;
327 +//package spec.benchmarks._205_raytrace;
328 //import IntersectPt;
331 diff -u raytrace1/TriangleObj.java raytrace/TriangleObj.java
332 --- raytrace1/TriangleObj.java Wed Jun 17 22:14:58 1998
333 +++ raytrace/TriangleObj.java Mon Nov 30 22:21:48 1998
335 * This source code is provided as is, without any express or implied warranty.
338 -package spec.benchmarks._205_raytrace;
339 +//package spec.benchmarks._205_raytrace;
341 //import IntersectPt;
343 diff -u raytrace1/Vector.java raytrace/Vector.java
344 --- raytrace1/Vector.java Wed Jun 17 22:14:59 1998
345 +++ raytrace/Vector.java Mon Nov 30 22:21:48 1998
347 * This source code is provided as is, without any express or implied warranty.
350 -package spec.benchmarks._205_raytrace;
351 +//package spec.benchmarks._205_raytrace;