Changeset df29bc2 in sasview for src/sas/sascalc/fit

Timestamp:

May 1, 2017 6:35:48 PM (8 years ago)

Author:

GitHub <noreply@…>

Parents:

658dd57 (diff), 733cdcd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Andrew Nelson <andyfaff@…> (05/01/17 18:35:48)

git-committer:

GitHub <noreply@…> (05/01/17 18:35:48)

Message:

Merge 733cdcd4ded452b8ad3afdec13db1f91a354aba4 into 658dd573a2872185ffe7439d96b51458fb88a94d

Location:

src/sas/sascalc/fit

Files:

• AbstractFitEngine.py (modified) (1 diff)
• Loader.py (modified) (1 diff)
• MultiplicationModel.py (modified) (1 diff)
• expression.py (modified) (3 diffs)
• pluginmodel.py (modified) (2 diffs)

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -251 +251 @@
             msg = "FitData1D: invalid error array "
             msg += "%d <> %d" % (np.shape(self.dy), np.size(fx))
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
         return (self.y[self.idx] - fx[self.idx]) / self.dy[self.idx], fx[self.idx]
             

src/sas/sascalc/fit/Loader.py

@@ -59 +59 @@
             # Sanity check
             if not len(self.x) == len(self.dx):
-                raise ValueError, "x and dx have different length"
+                raise ValueError("x and dx have different length")
             if not len(self.y) == len(self.dy):
-                raise ValueError, "y and dy have different length"
+                raise ValueError("y and dy have different length")
             
             

src/sas/sascalc/fit/MultiplicationModel.py

@@ -245 +245 @@
                     return
 
-        raise ValueError, "Model does not contain parameter %s" % name
+        raise ValueError("Model does not contain parameter %s" % name)
 
 

src/sas/sascalc/fit/expression.py

@@ -239 +239 @@
         if independent == emptyset:
             cycleset = ", ".join(str(s) for s in left)
-            raise ValueError,"Cyclic dependencies amongst %s"%cycleset
+            raise ValueError("Cyclic dependencies amongst %s"%cycleset)
 
         # The possibly resolvable items are those that depend on the independents
@@ -267 +267 @@
         n.sort()
         items = list(items); items.sort()
-        raise Exception,"%s expect %s to contain %s for %s"%(msg,n,items,pairs)
+        raise Exception("%s expect %s to contain %s for %s"%(msg,n,items,pairs))
     for lo,hi in pairs:
         if lo in n and hi in n and n.index(lo) >= n.index(hi):
-            raise Exception,"%s expect %s before %s in %s for %s"%(msg,lo,hi,n,pairs)
+            raise Exception("%s expect %s before %s in %s for %s"%(msg,lo,hi,n,pairs))
 
 def test_deps():
@@ -290 +290 @@
     try: n = order_dependencies(pairs)
     except ValueError: pass
-    else: raise Exception,"test3 expect ValueError exception for %s"%(pairs,)
+    else: raise Exception("test3 expect ValueError exception for %s"%(pairs,))
 
     # large test for gross speed check

src/sas/sascalc/fit/pluginmodel.py

@@ -35 +35 @@
             return self.function(x_val)*self.function(y_val)
         elif x.__class__.__name__ == 'tuple':
-            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError("Tuples are not allowed as input to BaseComponent models")
         else:
             return self.function(x)
@@ -52 +52 @@
             return self.function(x[0])*self.function(x[1])
         elif x.__class__.__name__ == 'tuple':
-            raise ValueError, "Tuples are not allowed as input to BaseComponent models"
+            raise ValueError("Tuples are not allowed as input to BaseComponent models")
         else:
             return self.function(x)