Changeset b2e2b0 in git for Singular/svd_si.h

Timestamp:

Jul 3, 2020, 5:03:52 PM (4 years ago)

Author:

Max Horn <max@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

d0adb23686023dffa37da6380408f9f10d314ae4

Parents:

94479b06ea30b1f20ba9a730ece0083db571e984

git-author:

Max Horn <max@quendi.de>2020-07-03 17:03:52+02:00

git-committer:

Max Horn <max@quendi.de>2020-07-07 09:42:17+02:00

Message:

Fix a bunch of warnings

File:

• Singular/svd_si.h (modified) (6 diffs)

Singular/svd_si.h

@@ -3225 +3225 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright && zrows==m);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m);
 
         //
@@ -3452 +3452 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright && zrows==n);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n);
 
         //
@@ -3860 +3860 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==m || !fromtheright && zrows==m);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==m : zrows==m);
 
         //
@@ -4075 +4075 @@
             return;
         }
-        ap::ap_error::make_assertion(fromtheright && zcolumns==n || !fromtheright && zrows==n);
+        ap::ap_error::make_assertion(fromtheright ? zcolumns==n : zrows==n);
 
         //
@@ -6897 +6897 @@
                 // First apply standard test to bottom of matrix
                 //
-                if( amp::abs<Precision>(e(m-1))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(m)) || tol<0 && amp::abs<Precision>(e(m-1))<=thresh )
+                if( amp::abs<Precision>(e(m-1))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(m)) || (tol<0 && amp::abs<Precision>(e(m-1))<=thresh) )
                 {
                     e(m-1) = 0;
@@ -6937 +6937 @@
                 // First apply standard test to top of matrix
                 //
-                if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || tol<0 && amp::abs<Precision>(e(ll))<=thresh )
+                if( amp::abs<Precision>(e(ll))<=amp::abs<Precision>(tol)*amp::abs<Precision>(d(ll)) || (tol<0 && amp::abs<Precision>(e(ll))<=thresh) )
                 {
                     e(ll) = 0;