[Gzz-commits] libvob/lava/blob fshape.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Changes by:     Tuomas J. Lukka <address@hidden>        03/05/24 14:18:29

Modified files:
        lava/blob      : fshape.py 

Log message:
        shapes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/lava/blob/fshape.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: libvob/lava/blob/fshape.py
diff -u libvob/lava/blob/fshape.py:1.3 libvob/lava/blob/fshape.py:1.4
--- libvob/lava/blob/fshape.py:1.3      Sat May 24 10:02:11 2003
+++ libvob/lava/blob/fshape.py  Sat May 24 14:18:28 2003
@@ -30,7 +30,7 @@
 
 from Tkinter import *
 
-length= 150
+length= 75
 epsilon = 0.0001
 
 # print l
@@ -39,7 +39,7 @@
     return (xright-xleft) * .5 * (rleft + rright)
 
 def L(xleft, xright, rleft, rright):
-    return sqrt((xright-xleft)**2 + yweight**2 * (rright-rleft)**2)
+    return sqrt(((xright-xleft)**2) * xweight ** 2 +  (rright-rleft)**2)
 
 def U(xleft, xright, rleft, rright):
 
@@ -100,7 +100,7 @@
     for a in (0, 1):
        x = s
        y = r * a
-       z = 0 * r
+       z = 0 * r  + ind
        for i in range(0, s.shape[0]):
            geomview.write("%s %s %s\n" % (x[i], y[i], z[i]))
     geomview.write("})\n")
@@ -122,18 +122,17 @@
        self.mom += g
        l = add.reduce(self.mom*self.mom)
        self.x += -self.step / sqrt(l) * self.mom
-       self.x = maximum(self.x, 0)
+       # self.x = maximum(self.x, 0)
        self.mom *= self.brake
 
 sur = []
-for i in range(1, 2):
-    l = 2**i
+for l in (1, 2, 3, 4):
     tl = l * length
     print "TL",tl
     x = zeros(2*tl, Float)
     x[0:tl] = arange(tl) * 1.0 / tl * l
-    x[tl] = 0.5
-    x[-1] = 0.5
+    x[tl] = 2
+    x[-1] = 2
     mi = MomGrad(minfunc, x)
     sur.append(mi)
 
@@ -150,16 +149,16 @@
        Frame.__init__(self, master)
        self.pack(expand=1, fill="both")
        Button(self, text="Start", command = self.idle).pack()
-       slider(self, "areaweight", DoubleVar(), 1, 0, 2);
-       slider(self, "yweight", DoubleVar(), 1, 0, 2);
+       slider(self, "areaweight", DoubleVar(), 1, 0, 10);
+       slider(self, "xweight", DoubleVar(), 1, 0, 10);
 
     def idle(self):
        print "Start idle"
        global areaweight
-       global yweight
+       global xweight
        for i in range(0, len(sur)):
            areaweight = ui.areaweight.get()
-           yweight = ui.yweight.get()
+           xweight = ui.xweight.get()
            for rou in range(0,100): sur[i].round()
            print "Pot:",sur[i].u
            wmesh(i, sur[i].x[0:sur[i].x.shape[0]/2], 
sur[i].x[sur[i].x.shape[0]/2:])