diff pyCSalgos/RecomTST/RecommendedTST.py @ 30:5f46ff51c7ff

Added console output detailing parameters Prepared for complete run 10.11.2011
author nikcleju
date Thu, 10 Nov 2011 22:43:11 +0000
parents 4393ad5bffc1
children
line wrap: on
line diff
--- a/pyCSalgos/RecomTST/RecommendedTST.py	Thu Nov 10 18:49:38 2011 +0000
+++ b/pyCSalgos/RecomTST/RecommendedTST.py	Thu Nov 10 22:43:11 2011 +0000
@@ -3,7 +3,7 @@
 import math
 
 #function beta = RecommendedTST(X,Y, nsweep,tol,xinitial,ro)
-def RecommendedTST(X, Y, nsweep=300, tol=0.00001, xinitial=None, ro=0):
+def RecommendedTST(X, Y, nsweep=300, tol=0.00001, xinitial=None, ro=None):
 
   # function beta=RecommendedTST(X,y, nsweep,tol,xinitial,ro)
   # This function gets the measurement matrix and the measurements and
@@ -111,7 +111,7 @@
   #  end
   if xinitial is None:
     xinitial = np.zeros(p)
-  if ro == 0:
+  if ro == None:
     ro = 0.044417*delta**2 + 0.34142*delta + 0.14844
   
   k1 = math.floor(ro*n)