From 4e050b58825d0fae83150249f148316fb291f61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sven=20Sch=C3=B6nherr?= <sven@inf.ethz.ch>
Date: Wed, 17 Nov 1999 11:00:53 +0000
Subject: [PATCH] subdirectory `include/CGAL/Optimisation' introduced. scope
 `CGAL::' added to `sqrt'.

---
 Packages/Min_circle_2/web/Min_circle_2.aw   | 10 +++++-----
 Packages/Min_ellipse_2/web/Conic_2.aw       | 16 ++++++++--------
 Packages/Min_ellipse_2/web/Min_ellipse_2.aw |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Packages/Min_circle_2/web/Min_circle_2.aw b/Packages/Min_circle_2/web/Min_circle_2.aw
index 00a95c301e2..6999c0b8605 100644
--- a/Packages/Min_circle_2/web/Min_circle_2.aw
+++ b/Packages/Min_circle_2/web/Min_circle_2.aw
@@ -1507,7 +1507,7 @@ emptiness and degeneracy, resp.
         double  sr( CGAL::to_double( oc.squared_radius()));
 
         if ( ! CGAL::is_negative( sr))
-            ws.draw_circle( cx, cy, sqrt( sr));
+            ws.draw_circle( cx, cy, CGAL::sqrt( sr));
         return( ws);
     }
 
@@ -2804,7 +2804,7 @@ end of each file.
 
     // includes
     #ifndef CGAL_OPTIMISATION_BASIC_H
-    #  include <CGAL/optimisation_basic.h>
+    #  include <CGAL/Optimisation/basic.h>
     #endif
     #ifndef CGAL_RANDOM_H
     #  include <CGAL/Random.h>
@@ -2942,7 +2942,7 @@ end of each file.
 
     // includes
     #ifndef CGAL_OPTIMISATION_ASSERTIONS_H
-    #  include <CGAL/optimisation_assertions.h>
+    #  include <CGAL/Optimisation/assertions.h>
     #endif
 
     @<namespace begin>("CGAL")
@@ -3017,7 +3017,7 @@ end of each file.
 
     // includes
     #ifndef CGAL_OPTIMISATION_BASIC_H
-    #  include <CGAL/optimisation_basic.h>
+    #  include <CGAL/Optimisation/basic.h>
     #endif
 
     @<namespace begin>("CGAL")
@@ -3056,7 +3056,7 @@ end of each file.
 
     // includes
     #ifndef CGAL_OPTIMISATION_BASIC_H
-    #  include <CGAL/optimisation_basic.h>
+    #  include <CGAL/Optimisation/basic.h>
     #endif
 
     @<namespace begin>("CGAL")
diff --git a/Packages/Min_ellipse_2/web/Conic_2.aw b/Packages/Min_ellipse_2/web/Conic_2.aw
index 13b4dac7257..c168f9a230f 100644
--- a/Packages/Min_ellipse_2/web/Conic_2.aw
+++ b/Packages/Min_ellipse_2/web/Conic_2.aw
@@ -949,8 +949,8 @@ the drawn curve(s).
                 double discr = (t*t-4.0*r*s)*(x*x) + (2.0*t*v-4.0*s*u)*x + 
                                  v*v - 4.0*s*w;
                 if (discr >= 0.0) {
-                    double y1 = (-t*x - v - sqrt(discr))/(2.0*s);
-                    double y2 = (-t*x - v + sqrt(discr))/(2.0*s);
+                    double y1 = (-t*x - v - CGAL::sqrt(discr))/(2.0*s);
+                    double y2 = (-t*x - v + CGAL::sqrt(discr))/(2.0*s);
                     X[pixels] = x; Y[pixels++] = y1;
                     X[pixels] = x; Y[pixels++] = y2; } }
         else
@@ -969,8 +969,8 @@ the drawn curve(s).
                 double discr = (t*t-4.0*r*s)*(y*y) + (2.0*t*u-4.0*r*v)*y + 
                                  u*u - 4.0*r*w;
                 if (discr >= 0.0) {
-                    double x1 = (-t*y - u - sqrt(discr))/(2.0*r);
-                    double x2 = (-t*y - u + sqrt(discr))/(2.0*r);
+                    double x1 = (-t*y - u - CGAL::sqrt(discr))/(2.0*r);
+                    double x2 = (-t*y - u + CGAL::sqrt(discr))/(2.0*r);
                     X[pixels] = x1; Y[pixels++] = y;
                     X[pixels] = x2; Y[pixels++] = y; } }
         else
@@ -2631,7 +2631,7 @@ be positive.
                    NT b3, NT b2, NT b1, NT b0)
     {
         bool det_positive = false;
-        NT d, q, max_det = 0, det, best;
+        NT d, q, max_det = 0, det, best = -1;
         for (int i=0; i<nr_values; ++i) {
             NT x = values[i];
             d = (a2*x+a1)*x+a0;
@@ -3178,7 +3178,7 @@ function and the functions in connection with the solution of cubic equations.
     #define CGAL_CONIC_MISC_H
 
     #ifndef CGAL_OPTIMISATION_ASSERTIONS_H
-    #  include <CGAL/optimisation_assertions.h>
+    #  include <CGAL/Optimisation/assertions.h>
     #endif
 
     @<namespace begin>("CGAL")
@@ -3274,7 +3274,7 @@ Here is the class @prg{ConicHPA2<PT,DA>}\ldots
     #  include <CGAL/Conic_misc.h>
     #endif
     #ifndef CGAL_OPTIMISATION_ASSERTIONS_H
-    #  include <CGAL/optimisation_assertions.h>
+    #  include <CGAL/Optimisation/assertions.h>
     #endif
 
     @<namespace begin>("CGAL")
@@ -3310,7 +3310,7 @@ Here is the class @prg{ConicHPA2<PT,DA>}\ldots
     #  include <CGAL/Conic_misc.h>
     #endif
     #ifndef CGAL_OPTIMISATION_ASSERTIONS_H
-    #  include <CGAL/optimisation_assertions.h>
+    #  include <CGAL/Optimisation/assertions.h>
     #endif
 
     @<namespace begin>("CGAL")
diff --git a/Packages/Min_ellipse_2/web/Min_ellipse_2.aw b/Packages/Min_ellipse_2/web/Min_ellipse_2.aw
index 0da4a8f8bda..576c5bac522 100644
--- a/Packages/Min_ellipse_2/web/Min_ellipse_2.aw
+++ b/Packages/Min_ellipse_2/web/Min_ellipse_2.aw
@@ -3016,7 +3016,7 @@ end of each file.
 
     // includes
     #ifndef CGAL_OPTIMISATION_BASIC_H
-    #  include <CGAL/optimisation_basic.h>
+    #  include <CGAL/Optimisation/basic.h>
     #endif
     #ifndef CGAL_RANDOM_H
     #  include <CGAL/Random.h>
@@ -3116,7 +3116,7 @@ end of each file.
     #  include <CGAL/Conic_2.h>
     #endif
     #ifndef CGAL_OPTIMISATION_ASSERTIONS_H
-    #  include <CGAL/optimisation_assertions.h>
+    #  include <CGAL/Optimisation/assertions.h>
     #endif
     #ifndef CGAL_IO_FORWARD_DECL_WINDOW_STREAM_H
     #  include <CGAL/IO/forward_decl_window_stream.h>
@@ -3232,7 +3232,7 @@ end of each file.
     #  include <CGAL/ConicCPA2.h>
     #endif
     #ifndef CGAL_OPTIMISATION_ASSERTIONS_H
-    #  include <CGAL/optimisation_assertions.h>
+    #  include <CGAL/Optimisation/assertions.h>
     #endif
 
     @<namespace begin>("CGAL")
@@ -3305,7 +3305,7 @@ end of each file.
     #  include <CGAL/ConicHPA2.h>
     #endif
     #ifndef CGAL_OPTIMISATION_ASSERTIONS_H
-    #  include <CGAL/optimisation_assertions.h>
+    #  include <CGAL/Optimisation/assertions.h>
     #endif
 
     @<namespace begin>("CGAL")