Commit 08e2e788 authored by Marco Selig's avatar Marco Selig
Browse files

enforce value copying fiexed; cg residual reset.

parent 002a8512
...@@ -514,7 +514,7 @@ class _about(object): ## nifty support class for global settings ...@@ -514,7 +514,7 @@ class _about(object): ## nifty support class for global settings
""" """
## version ## version
self._version = "0.9.2" self._version = "0.9.3"
## switches and notifications ## switches and notifications
self._errors = notification(default=True,ccode=notification._code) self._errors = notification(default=True,ccode=notification._code)
...@@ -1238,7 +1238,7 @@ class space(object): ...@@ -1238,7 +1238,7 @@ class space(object):
if(self.datatype is not x.domain.datatype): if(self.datatype is not x.domain.datatype):
raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' ).")) raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' )."))
else: else:
x = np.copy(x.val,order='C') x = np.copy(x.val)
else: else:
raise ValueError(about._errors.cstring("ERROR: inequal domains.")) raise ValueError(about._errors.cstring("ERROR: inequal domains."))
else: else:
...@@ -2527,7 +2527,7 @@ class rg_space(space): ...@@ -2527,7 +2527,7 @@ class rg_space(space):
if(self.datatype is not x.domain.datatype): if(self.datatype is not x.domain.datatype):
raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' ).")) raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' )."))
else: else:
x = x.val x = np.copy(x.val)
else: else:
raise ValueError(about._errors.cstring("ERROR: inequal domains.")) raise ValueError(about._errors.cstring("ERROR: inequal domains."))
else: else:
...@@ -3561,7 +3561,7 @@ class lm_space(space): ...@@ -3561,7 +3561,7 @@ class lm_space(space):
if(self.datatype is not x.domain.datatype): if(self.datatype is not x.domain.datatype):
raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' ).")) raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' )."))
else: else:
x = x.val x = np.copy(x.val)
else: else:
raise ValueError(about._errors.cstring("ERROR: inequal domains.")) raise ValueError(about._errors.cstring("ERROR: inequal domains."))
else: else:
...@@ -5513,7 +5513,7 @@ class nested_space(space): ...@@ -5513,7 +5513,7 @@ class nested_space(space):
if(self.datatype is not x.domain.datatype): if(self.datatype is not x.domain.datatype):
raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' ).")) raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' )."))
else: else:
x = x.val x = np.copy(x.val)
elif(self.nest[-1]==x.domain): elif(self.nest[-1]==x.domain):
if(self.datatype is not x.domain.datatype): if(self.datatype is not x.domain.datatype):
raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' ).")) raise TypeError(about._errors.cstring("ERROR: inequal data types ( '"+str(np.result_type(self.datatype))+"' <> '"+str(np.result_type(x.domain.datatype))+"' )."))
......
...@@ -749,7 +749,7 @@ class conjugate_gradient(object): ...@@ -749,7 +749,7 @@ class conjugate_gradient(object):
gamma = r.dot(d) gamma = r.dot(d)
if(gamma==0): if(gamma==0):
return self.x,clevel+1 return self.x,clevel+1
delta_ = self.b.norm**(-1)#np.absolute(gamma)**(-0.5) ## independent delta_ = np.absolute(gamma)**(-0.5)
convergence = 0 convergence = 0
ii = 1 ii = 1
...@@ -815,7 +815,7 @@ class conjugate_gradient(object): ...@@ -815,7 +815,7 @@ class conjugate_gradient(object):
gamma = r.dot(d) gamma = r.dot(d)
if(gamma==0): if(gamma==0):
return self.x,clevel+1 return self.x,clevel+1
delta_ = self.b.norm**(-1)#np.absolute(gamma)**(-0.5) ## independent delta_ = np.absolute(gamma)**(-0.5)
convergence = 0 convergence = 0
ii = 1 ii = 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment