Fixed include paths for headers

base2z.cc

@@ -6,9 +6,8 @@
 
 /*  CCOPYRIGHT  */
 
-#include <cmath>
 #include "base2z.h"
-#include "libprob.h"
+#include "libprob/libprob.h"
 
 namespace MISCMATHS {
 

base2z.h

@@ -9,8 +9,6 @@
 #if !defined(__base2z_h)
 #define __base2z_h
 
-#include <iostream>
-#include <fstream>
 
 namespace MISCMATHS {
   

f2z.cc

@@ -6,12 +6,10 @@
 
 /*  CCOPYRIGHT  */
 
-#include <cmath>
 #include "f2z.h"
-#include "log.h"
-#include "tracer_plus.h"
-#include <stdexcept>
-#include "libprob.h"
+#include "utils/log.h"
+#include "utils/tracer_plus.h"
+#include "libprob/libprob.h"
 
 using namespace NEWMAT;
 using namespace Utilities;

f2z.h

@@ -9,10 +9,8 @@
 #if !defined(__f2z_h)
 #define __f2z_h
   
-#include <iostream>
-#include <fstream>
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include "base2z.h"
 //#include "miscmaths.h"
 

histogram.h

@@ -9,13 +9,11 @@
 #if !defined(__histogram_h)
 #define __histogram_h
 
-#include <iostream>
-#include <fstream>
 #define WANT_STREAM
 #define WANT_MATH
 
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include "miscmaths.h"
 
 using namespace NEWMAT;

kernel.h

@@ -11,11 +11,7 @@
 #if !defined(kernel_h)
 #define kernel_h
 
-#include <iostream>
-#include <string>
-#include <set>
-#include <cmath>
-#include "newmat.h"
+#include "newmat/newmat.h"
       
 using namespace NEWMAT;
 using namespace std;

miscmaths.h

@@ -12,14 +12,7 @@
 #if !defined(__miscmaths_h)
 #define __miscmaths_h
 
-#include <cmath>
-#include <vector>
-#include <iostream>
-#include <assert.h>
-#include <fstream>
-#include <strstream>
-#include <string>
-#include "newmatap.h"
+#include "newmat/newmatap.h"
 #include "kernel.h"
 
 //#pragma interface

miscprob.cc

@@ -10,8 +10,7 @@
 
 #include "miscprob.h"
 #include "stdlib.h"
-#include "newmatio.h"
-#include <iostream>
+#include "newmat/newmatio.h"
 
 using namespace NEWMAT;
 

miscprob.h

@@ -13,7 +13,7 @@
 #define __miscprob_h
 
 #include "miscmaths.h"
-#include "libprob.h"
+#include "libprob/libprob.h"
 #include "stdlib.h"
 
 using namespace NEWMAT;

optimise.cc

@@ -9,8 +9,6 @@
 // Mathematical optimisation functions
 
 
-#include <iostream>
-#include <cmath>
 #include "optimise.h"
 #include "miscmaths.h"
 

optimise.h

@@ -12,8 +12,7 @@
 #if !defined(__optimise_h)
 #define __optimise_h
 
-#include <cmath>
-#include "newmatap.h"
+#include "newmat/newmatap.h"
 
 using namespace NEWMAT;
 

quick.cc

-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <strstream>
 #define WANT_STREAM
 #define WANT_MATH
 
 #include "miscmaths.h"
-#include "libprob.h"
+#include "libprob/libprob.h"
 
 using namespace MISCMATHS;
 

t2z.cc

@@ -6,11 +6,10 @@
 
 /*  CCOPYRIGHT  */
 
-#include <cmath>
 #include "t2z.h"
-#include "newmat.h"
-#include "tracer_plus.h"
-#include "libprob.h"
+#include "newmat/newmat.h"
+#include "utils/tracer_plus.h"
+#include "libprob/libprob.h"
 
 using namespace NEWMAT;
 using namespace Utilities;

t2z.h

@@ -9,10 +9,8 @@
 #if !defined(__t2z_h)
 #define __t2z_h
   
-#include <iostream>
-#include <fstream>
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include "base2z.h"
 
 using namespace NEWMAT;