[Gzz-commits] gzz/lava/gfx/shopt smcurv.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/08/30 03:54:21

Modified files:
        lava/gfx/shopt : smcurv.py 

Log message:
        Some new experiments

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gfx/shopt/smcurv.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/lava/gfx/shopt/smcurv.py
diff -c gzz/lava/gfx/shopt/smcurv.py:1.3 gzz/lava/gfx/shopt/smcurv.py:1.4
*** gzz/lava/gfx/shopt/smcurv.py:1.3    Wed Aug 28 08:00:44 2002
--- gzz/lava/gfx/shopt/smcurv.py        Fri Aug 30 03:54:21 2002
***************
*** 11,16 ****
--- 11,17 ----
      def addWidgets(self, parent):
        frame = Frame(parent)
        slider(self, "eqdist", DoubleVar(), 0.1, 0, 1, parent=frame)
+       slider(self, "kdisteq", DoubleVar(), 1, 0, 10, parent=frame)
        slider(self, "kdist", DoubleVar(), 1, 0, 10, parent=frame)
        slider(self, "distexp", DoubleVar(), 2, 0, 10, parent=frame, 
resolution=2)
        slider(self, "kcurv", DoubleVar(), 1, 0, 10, parent=frame)
***************
*** 30,39 ****
--- 31,44 ----
        x[1,-1] = 0.1
        x[0,1] = 0.0
        x[0,-2] = 0.1
+ 
+       # self.curvmult = ((rang-0.5)**2)[ 1:-1]
+       self.curvmult = 1
        return x
      def __call__(self, v):
        # print "V:",v
        eqdist = self.eqdist.get()
+       kdisteq = self.kdisteq.get()
        kdist = self.kdist.get()
        kcurv = self.kcurv.get()
        xoffs = self.xoffs.get()
***************
*** 46,52 ****
        def scalarneighpot(x1, y1, x2, y2):
            # return 1 * (sqrt((x2-x1)**2 + (y2-y1)**2)/self.dice - 1.0)**2 / 
self.dice
            dist = sqrt((x2-x1)**2 + (y2-y1)**2)
!           return kdist * ((dist*self.dice-eqdist)**distexp)/self.dice
        def scalardneighpot(x1, y1, x2, y2, x3, y3):
            # Calculate angle of turning
            #return 0*x3
--- 51,59 ----
        def scalarneighpot(x1, y1, x2, y2):
            # return 1 * (sqrt((x2-x1)**2 + (y2-y1)**2)/self.dice - 1.0)**2 / 
self.dice
            dist = sqrt((x2-x1)**2 + (y2-y1)**2)
!           distsum = add.reduce(dist[0]) / self.dice
!           return kdisteq * ((dist*self.dice-distsum)**distexp)/self.dice + \
!                   kdist * dist**2;
        def scalardneighpot(x1, y1, x2, y2, x3, y3):
            # Calculate angle of turning
            #return 0*x3
***************
*** 58,64 ****
            l2sq = (dx2**2+dy2**2)
            dot = (dx1*dx2 + dy1*dy2)
            cosangle = dot / (sqrt(l1sq * l2sq+0.00001))
!           return kcurv * (1 - cosangle) ** curvexp
            # (((l1sq+l2sq-2*dot))) 
  
        grad = v*0
--- 65,72 ----
            l2sq = (dx2**2+dy2**2)
            dot = (dx1*dx2 + dy1*dy2)
            cosangle = dot / (sqrt(l1sq * l2sq+0.00001))
!           # print "Ca",cosangle[0].shape,self.curvmult.shape
!           return kcurv * self.curvmult * (1 - cosangle) ** curvexp
            # (((l1sq+l2sq-2*dot))) 
  
        grad = v*0