Przeglądaj źródła

Remove redundant code.

mingodad 12 lat temu
rodzic
commit
09f4476406

+ 1 - 1
SquiLu/samples/binary-tree.nut

@@ -34,7 +34,7 @@ if (maxdepth < N) maxdepth = N
 local longlivedtree = BottomUpTree(0, maxdepth)
 local longlivedtree = BottomUpTree(0, maxdepth)
 
 
 for(local depth=mindepth; depth <= maxdepth; depth += 2){
 for(local depth=mindepth; depth <= maxdepth; depth += 2){
-  local iterations = math.pow(2, (maxdepth - depth + mindepth))
+  local iterations = math.pow(2, (maxdepth - depth + mindepth)).tointeger()
   local check = 0
   local check = 0
   for(local i=0; i < iterations; ++i){
   for(local i=0; i < iterations; ++i){
     check += ItemCheck(BottomUpTree(1, depth)) +
     check += ItemCheck(BottomUpTree(1, depth)) +

+ 12 - 11
SquiLu/samples/n-body.nut

@@ -67,13 +67,13 @@ local function advance(bodies, nbody, dt){
       local mag = sqrt(dx*dx + dy*dy + dz*dz)
       local mag = sqrt(dx*dx + dy*dy + dz*dz)
       mag = dt / (mag * mag * mag)
       mag = dt / (mag * mag * mag)
       local bm = bj.mass*mag
       local bm = bj.mass*mag
-      bivx = bivx - (dx * bm)
-      bivy = bivy - (dy * bm)
-      bivz = bivz - (dz * bm)
+      bivx -= (dx * bm)
+      bivy -= (dy * bm)
+      bivz -= (dz * bm)
       bm = bimass*mag
       bm = bimass*mag
-      bj.vx = bj.vx + (dx * bm)
-      bj.vy = bj.vy + (dy * bm)
-      bj.vz = bj.vz + (dz * bm)
+      bj.vx += (dx * bm)
+      bj.vy += (dy * bm)
+      bj.vz += (dz * bm)
     }
     }
     bi.vx = bivx
     bi.vx = bivx
     bi.vy = bivy
     bi.vy = bivy
@@ -89,12 +89,12 @@ local function energy(bodies, nbody){
   for(local i=0; i < nbody; ++i){
   for(local i=0; i < nbody; ++i){
     local bi = bodies[i]
     local bi = bodies[i]
     local vx = bi.vx, vy = bi.vy, vz = bi.vz, bim = bi.mass
     local vx = bi.vx, vy = bi.vy, vz = bi.vz, bim = bi.mass
-    e = e + (0.5 * bim * (vx*vx + vy*vy + vz*vz))
+    e += (0.5 * bim * (vx*vx + vy*vy + vz*vz))
     for(local j=i+1; j < nbody; ++j){
     for(local j=i+1; j < nbody; ++j){
       local bj = bodies[j]
       local bj = bodies[j]
       local dx = bi.x-bj.x, dy = bi.y-bj.y, dz = bi.z-bj.z
       local dx = bi.x-bj.x, dy = bi.y-bj.y, dz = bi.z-bj.z
       local distance = sqrt(dx*dx + dy*dy + dz*dz)
       local distance = sqrt(dx*dx + dy*dy + dz*dz)
-      e = e - ((bim * bj.mass) / distance)
+      e -= ((bim * bj.mass) / distance)
     }
     }
   }
   }
   return e
   return e
@@ -109,9 +109,10 @@ local function offsetMomentum(b, nbody){
     py = py + (bi.vy * bim)
     py = py + (bi.vy * bim)
     pz = pz + (bi.vz * bim)
     pz = pz + (bi.vz * bim)
   }
   }
-  b[0].vx = -px / SOLAR_MASS
-  b[0].vy = -py / SOLAR_MASS
-  b[0].vz = -pz / SOLAR_MASS
+  local b0 = b[0]
+  b0.vx = -px / SOLAR_MASS
+  b0.vy = -py / SOLAR_MASS
+  b0.vz = -pz / SOLAR_MASS
 }
 }
 
 
 local start = os.clock()
 local start = os.clock()

+ 1 - 0
SquiLu/samples/spectralnorm.nut

@@ -28,6 +28,7 @@ local function AtAv(x, y, t, N){
   Atv(t, y, N)
   Atv(t, y, N)
 }
 }
 
 
+//check_delayed_release_hooks(false);
 local N = vargv.get(1, 500).tointeger();
 local N = vargv.get(1, 500).tointeger();
 
 
 local start = os.clock()
 local start = os.clock()