Prevent infinite looping in DELEG7 and DEJAC7. Get JAPHYC abnormal exit Number of...
authorilb@NIH.GOV <ilb@NIH.GOV@ba61647d-9d00-f842-95cd-605cb4296b96>
Fri, 16 Feb 2018 19:26:52 +0000 (19:26 +0000)
committerilb@NIH.GOV <ilb@NIH.GOV@ba61647d-9d00-f842-95cd-605cb4296b96>
Fri, 16 Feb 2018 19:26:52 +0000 (19:26 +0000)
git-svn-id: https://citdcbmipav.cit.nih.gov/repos-pub/mipav/trunk@15382 ba61647d-9d00-f842-95cd-605cb4296b96

mipav/src/gov/nih/mipav/model/algorithms/SymmsIntegralMapping.java

index 71767b2..b16321b 100644 (file)
@@ -6195,6 +6195,9 @@ public class SymmsIntegralMapping extends AlgorithmBase {
                                if (TAU[0] == 1.0) {\r
                                        TOL[0] = HTOL;\r
                                }\r
+                               if ((TAU[0] == LOWER) && (TAU[0] == UPPER)) {\r
+                                       break;\r
+                               }\r
                                UPPER = TAU[0];\r
                                TAU[0] = 0.5 * (LOWER + UPPER);\r
                                continue;\r
@@ -6391,7 +6394,6 @@ public class SymmsIntegralMapping extends AlgorithmBase {
                FIRST = true;\r
 \r
                while (true) {\r
-\r
                        HTOL = 0.5 * TOL[0];\r
                        RR = (TAU2[0] - TAU1[0]) * 0.5;\r
                        MEAN = (TAU1[0] + TAU2[0]) * 0.5;\r
@@ -6474,7 +6476,7 @@ public class SymmsIntegralMapping extends AlgorithmBase {
                                                LOWER = TAU2[0];\r
                                                TAU2[0] = 0.5 * (LOWER + UPPER);\r
                                                continue;\r
-                                       } else if (!T1FXD && TAU1[0] > -1.0) {\r
+                                       } else if ((!T1FXD) && (TAU1[0] > -1.0)) {\r
                                                UPPER = TAU1[0];\r
                                                TAU1[0] = 0.5 * (LOWER + UPPER);\r
                                                continue;\r
@@ -6496,9 +6498,15 @@ public class SymmsIntegralMapping extends AlgorithmBase {
                                        FIRST = false;\r
                                }\r
                                if (T1FXD) {\r
+                                       if ((TAU2[0] == LOWER) && (TAU2[0] == UPPER)) {\r
+                                               break;\r
+                                       }\r
                                        UPPER = TAU2[0];\r
                                        TAU2[0] = 0.5 * (LOWER + UPPER);\r
                                } else {\r
+                                       if ((TAU1[0] == LOWER) && (TAU1[0] == UPPER)) {\r
+                                               break;\r
+                                       }\r
                                        LOWER = TAU1[0];\r
                                        TAU1[0] = 0.5 * (LOWER + UPPER);\r
                                }\r
@@ -8176,7 +8184,7 @@ public class SymmsIntegralMapping extends AlgorithmBase {
 \r
                IER[0] = 0;\r
 \r
-       } // private void UPOCOQ1\r
+       } // private void UPCOQ1\r
 \r
        private void TSJAC3(int LOTES[], int HITES[], double TESPR[], double ZTEST[][], int NQPTS, int NTEST[], int ORDSG,\r
                        int TNSUA, int TSTNG, int DGPOL[], int JATYP[], int PARNT[], double AICOF[], double BICOF[], double DIAG[],\r