Commit: 7f725d5e210b09ea77030af9488c489dcba1c5e2 - myprojects-hg-reborn (hg)

Commit MetaInfo

• Revision: 7f725d5e210b09ea77030af9488c489dcba1c5e2 (tree)
• Time: 2014-11-03 19:54:35
• Author: Lorenzo Isella <lorenzo.isella@gmai...>
• Commiter: Lorenzo Isella

Log Message

Minor modifications: I just changed the name of a module I need to import.

Change Summary

• modified: Python-codes/iterate_compose_clusters.py
• modified: Python-codes/iterate_filippov.py

Incremental Difference

diff -r f3f28c1a67c5 -r 7f725d5e210b Python-codes/iterate_compose_clusters.py
--- a/Python-codes/iterate_compose_clusters.py	Fri Oct 31 18:22:02 2014 +0100
+++ b/Python-codes/iterate_compose_clusters.py	Mon Nov 03 11:54:35 2014 +0100
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-#from enthought.mayavi import mlab
+from mayavi import mlab
 import scipy.linalg as sl
 
 import scipy as s
@@ -747,7 +747,7 @@
 ########################################################################
 
 
-kf=1.6
+kf=1.3
 df= 1.78   # 1.8
 epsi=0.01
 n_steps=8000 #with the first algorithm, it is the number of failed attempts
@@ -756,14 +756,14 @@
 #With the second algoritm, 2pi/n_steps is the angle of every to rotation. 
 
 
-algo=2  # use the algorithm which is indicated for low df
+algo=1  # use the algorithm which is indicated for low df
         #=2 use the algortihm for high fractal dimension
 
 # clust_to_combine=32
 
 start=0
 
-end=128
+end=64
 
 clust_list=[]
 
@@ -851,12 +851,12 @@
 z=final_cluster[:,2]
 
 
-#mlab.clf()
-#pts = mlab.points3d(x, y, z, scale_mode='none', resolution=20,\
-#                        color=(0,0,1),scale_factor=2.)
+mlab.clf()
+pts = mlab.points3d(x, y, z, scale_mode='none', resolution=20,\
+                        color=(0,0,1),scale_factor=2.)
 #mlab.axes(pts)
 
-#mlab.show()
+mlab.show()
 
 
 R1_agg_sq=s.var(final_cluster[:,0])+s.var(final_cluster[:,1])+\

diff -r f3f28c1a67c5 -r 7f725d5e210b Python-codes/iterate_filippov.py
--- a/Python-codes/iterate_filippov.py	Fri Oct 31 18:22:02 2014 +0100
+++ b/Python-codes/iterate_filippov.py	Mon Nov 03 11:54:35 2014 +0100
@@ -1,6 +1,9 @@
 #! /usr/bin/env python
 
-#from enthought.mayavi import mlab
+# from enthought.mayavi import mlab
+
+from mayavi import mlab
+
 
 import scipy as s
 import numpy as n
@@ -223,14 +226,14 @@
 
 # N=3.
 # a=1. and removed from the formula
-kf=1.6
+kf=1.3
 df= 1.78   # 1.8
 
 epsi=0.01
 
 # N_iter=80
 
-N_clust=128
+N_clust=64
 
 
 # d_square= new_dist_sq(N,df,kf)