trf++/test/trfxyp

diff -u -r1.1 -r1.2
--- PropXYXYRK_t.cpp	8 Aug 2011 19:06:53 -0000	1.1
+++ PropXYXYRK_t.cpp	8 Aug 2011 21:36:55 -0000	1.2
@@ -2,15 +2,17 @@

 
 // Test PropXYXYRK.
 

-#include "PropXYXYRK.h"
-#include "PropXYXY.h"

+#include "trfxyp/PropXYXYRK.h"
+#include "trfxyp/PropXYXY.h"

 #include "trfbase/PropStat.h"
 #include <string>
 #include <iostream>
 #include <cassert>
 #include <sstream>

+#include <cmath>
+#include <cstdlib>

 #include "objstream/StdObjStream.hpp"

-#include "SurfXYPlane.h"

+#include "trfxyp/SurfXYPlane.h"

 #include "trfbase/TrackVector.h"
 #include "trfbase/VTrack.h"
 #include "trfbase/ETrack.h"

@@ -19,14 +21,16 @@

 #include "spacegeom/SpacePoint.h"
 #include "spacegeom/SpacePath.h"
 

-#ifndef DEFECT_NO_STDLIB_NAMESPACES

+//#ifndef DEFECT_NO_STDLIB_NAMESPACES

 using std::cout;
 using std::cerr;
 using std::endl;
 using std::string;
 using std::ostringstream;
 using std::istringstream;

-#endif

+using std::max;
+//#endif
+

 
 using namespace trf;
 

@@ -180,7 +184,7 @@

 	double dij = (trv1b.get_vector(i) - trv1c.get_vector(i))/(2.*d);
 	cout << i << ", " << j << '\t' <<  dij << '\t' << deriv(i,j) 
 	     << '\t' << deriv0(i,j) << endl;

-	double scale = max(abs(deriv(i,j)), 1.);

+	double scale = max(abs(deriv(i,j)), 1);

 	assert(abs(deriv(i,j)-deriv0(i,j))/scale < maxdiff);
 	assert(abs(dij-deriv(i,j))/scale < 1.e-3);
       }

@@ -215,7 +219,7 @@

       for(int i=0; i<5; ++i) {
 	double dijn = (trv1bn.get_vector(i) - trv1cn.get_vector(i))/(2.*d);
 	cout << i << ", " << j << '\t' <<  dijn << '\t' << derivn(i,j) << endl;

-	double scale = max(abs(derivn(i,j)), 1.);

+	double scale = max(abs(derivn(i,j)), 1);

 	assert(abs(dijn-derivn(i,j))/scale < 1.e-3);
       }
     }