Changeset 520 for branches/Couenne/Couenne/src/convex/operators/conv-exprInv.cpp

Timestamp:

Apr 27, 2007 3:39:58 PM (13 years ago)

Author:

pbelotti

Message:

limit power upper/lower bounds to get reasonable coefficients

File:

• branches/Couenne/Couenne/src/convex/operators/conv-exprInv.cpp (modified) (3 diffs)

branches/Couenne/Couenne/src/convex/operators/conv-exprInv.cpp

@@ -46 +46 @@
 
 
-// derivative of inv (x)
-
-inline CouNumber oppInvSqr (register CouNumber x) 
-{return (- inv (x*x));}
-
-
 #define MIN_DENOMINATOR 1e-10
 
@@ -79 +73 @@
   aux -> getBounds (wle, wue);
 
-  expression *xe = argument_;
-
-  CouNumber x = (*xe)  ();
+  CouNumber x;
 
   int w_ind = aux       -> Index (), 
@@ -107 +99 @@
   }
 
-  int sign = (l > 0) ? +1 : -1;
-
   // bound
-
-  cg -> addEnvelope (cs, sign, inv, oppInvSqr, w_ind, x_ind, x, l, u);
+  cg -> addEnvelope 
+    (cs, (l > 0) ? +1 : -1, 
+     inv, oppInvSqr, w_ind, x_ind, 
+     (cg -> isFirst ()) ?
+       // place it somewhere in the interval (we won't care)
+       ((l > COUENNE_EPS) ? l : u) :
+       // not first call, gotta replace it where it gives deepest cut
+       powNewton ((*argument_) (), (*aux) (), inv, oppInvSqr, inv_dblprime),
+     l, u);
 
   delete xle;