Changeset 385

Timestamp:

08/19/08 19:37:01 (3 months ago)

Author:

powell

Message:

Fixes to NewtonRefine?, now it works.

Files:

• trunk/matml/src/ternary/qhull.c (modified) (3 diffs)

trunk/matml/src/ternary/qhull.c

@@ -125 +125 @@
       double vG=x2*y3-x3*y2;
       slope2 = (xG*y3-x3*yG)/vG;
-      slope3 = (xG*y2-x2*yG)/vG;
+      slope3 = (x2*yG-xG*y2)/vG;
 
       printf ("      corners: %g %g %g %g %g %g %g %g %g\n      slopes: %g %g\n",
@@ -146 +146 @@
          current.C2>=0. && current.C3>=0. && current.C2+current.C3<=1.)
     {
-      double dC2, dC3;
+      double dC2, dC3, det;
 
       /*+ Calculate the energy derivatives +*/
@@ -152 +152 @@
 
       /*+ Subtract the facet slopes from the energy derivatives +*/
-      current.G2 += slope2;
-      current.G3 += slope3;
+      current.G2 -= slope2;
+      current.G3 -= slope3;
 
       /*+ Solve the linear system to estimate the vector to the minimum +*/
-      dC3 = current.G22*current.G33 - current.G23*current.G23;
-      dC2 = (current.G3*current.G23 - current.G2*current.G33) / dC3;
-      dC3 = (current.G2*current.G23 - current.G3*current.G22) / dC3;
+      det = current.G22*current.G33 - current.G23*current.G23;
+      dC2 = (current.G3*current.G23 - current.G2*current.G33) / det;
+      dC3 = (current.G2*current.G23 - current.G3*current.G22) / det;
 
       /*+ Add that vector to the point +*/