Successful run on ninth test example.
authorilb@NIH.GOV <ilb@NIH.GOV@ba61647d-9d00-f842-95cd-605cb4296b96>
Fri, 8 Dec 2017 20:11:53 +0000 (20:11 +0000)
committerilb@NIH.GOV <ilb@NIH.GOV@ba61647d-9d00-f842-95cd-605cb4296b96>
Fri, 8 Dec 2017 20:11:53 +0000 (20:11 +0000)
git-svn-id: https://citdcbmipav.cit.nih.gov/repos-pub/mipav/trunk@15301 ba61647d-9d00-f842-95cd-605cb4296b96

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

index 0b2393e..53c5dc3 100644 (file)
@@ -35,6 +35,7 @@ public class DoublyConnectedSC extends AlgorithmBase {
        //private final int EXAMPLE_GIVEN_FOR_CHECKING_INVERSE_MAP = 6;\r
        //private final int UPPER_HALF_PLANE_WITH_HORIZONTAL_SLIT = 7;\r
        //private final int EXAMPLE_8 = 8;\r
+       //private final int EXAMPLE_9 = 9;\r
        \r
        private final int dscfun = 1;\r
        \r
@@ -155,7 +156,7 @@ double neweps;
                if (testRoutine) {\r
                        DSCDATA(IPOLY, M, N, Z0, Z1, ALFA0, ALFA1);\r
                        ANGLES(N[0], Z1, ALFA1, 1);\r
-                       if ((IPOLY == 1) || (IPOLY == 3) || (IPOLY == 4) || (IPOLY == 6) || (IPOLY == 8)) {\r
+                       if ((IPOLY == 1) || (IPOLY == 3) || (IPOLY == 4) || (IPOLY == 6) || (IPOLY == 8) || (IPOLY == 9)) {\r
                                ANGLES(M[0], Z0, ALFA0, 0);\r
                        }\r
                        \r
@@ -547,6 +548,24 @@ double neweps;
                    FORWARD_POINTS[2][0] = -1.0;\r
                    FORWARD_POINTS[2][1] = 0.0;\r
                } // else if (IPOLY == 8)\r
+               else if (IPOLY == 9) {\r
+                       M[0] = 4;\r
+                       N[0] = 3;\r
+                       Z0[0][0] = 1.0;\r
+                       Z0[0][1] = 1.0;\r
+                       Z0[1][0] = 4.0;\r
+                       Z0[1][1] = 1.0;\r
+                       Z0[2][0] = 4.0;\r
+                       Z0[2][1] = 4.0;\r
+                       Z0[3][0] = 1.0;\r
+                       Z0[3][1] = 4.0;\r
+                       Z1[0][0] = 2.75;\r
+                       Z1[0][1] = 1.5;\r
+                       Z1[1][0] = 3.25;\r
+                       Z1[1][1] = 3.25;\r
+                       Z1[2][0] = 1.5;\r
+                       Z1[2][1] = 3.0;\r
+               } // else if (IPOLY == 9)\r
        }\r
        \r
        private void THDATA(double U[]) {\r