Fixed include paths for headers

band_pass.cc

@@ -6,6 +6,9 @@
 
 /*  CCOPYRIGHT  */
 
+#include <iostream>
+#include <fstream>
+#include <strstream>
 #define WANT_STREAM
 #define WANT_MATH
 
@@ -15,6 +18,7 @@
 #include "Volume.h"
 #include "utils/log.h"
 #include "BandPassOptions.h"
+#include <string>
 
 #ifndef NO_NAMESPACE
 using namespace NEWMAT;

contrast_mgr.cc

@@ -6,6 +6,9 @@
 
 /*  CCOPYRIGHT  */
 
+#include <iostream>
+#include <fstream>
+#include <strstream>
 #define WANT_STREAM
 #define WANT_MATH
 
@@ -18,6 +21,7 @@
 #include "utils/log.h"
 #include "ContrastMgrOptions.h"
 #include "utils/tracer_plus.h"
+#include <string>
 
 using namespace NEWMAT;
 using namespace FILM;

film_gls.cc

@@ -6,6 +6,9 @@
 
 /*  CCOPYRIGHT  */
 
+#include <iostream>
+#include <fstream>
+#include <strstream>
 #define WANT_STREAM
 #define WANT_MATH
 
@@ -19,6 +22,8 @@
 #include "paradigm.h"
 #include "FilmGlsOptions.h"
 #include "glimGls.h"
+#include <vector>
+#include <string>
 
 using namespace NEWMAT;
 using namespace FILM;

film_gls_res.cc

@@ -6,6 +6,9 @@
 
 /*  CCOPYRIGHT  */
 
+#include <iostream>
+#include <fstream>
+#include <strstream>
 #define WANT_STREAM
 #define WANT_MATH
 
@@ -20,6 +23,8 @@
 #include "paradigm.h"
 #include "FilmGlsOptionsRes.h"
 #include "glimGls.h"
+#include <vector>
+#include <string>
 
 using namespace NEWMAT;
 using namespace FILM;

film_ols.cc

@@ -6,6 +6,9 @@
 
 /*  CCOPYRIGHT  */
 
+#include <iostream>
+#include <fstream>
+#include <strstream>
 #define WANT_STREAM
 #define WANT_MATH
 
@@ -20,6 +23,7 @@
 #include "AutoCorrEstimator.h"
 #include "paradigm.h"
 #include "FilmOlsOptions.h"
+#include <string>
 
 using namespace NEWMAT;
 using namespace FILM;

ftoz.cc

@@ -6,6 +6,8 @@
 
 /*  CCOPYRIGHT  */
 
+#include <iostream>
+#include <fstream>
 #define WANT_STREAM
 #define WANT_MATH
 
@@ -14,6 +16,7 @@
 
 #include "miscmaths/f2z.h"
 #include "Volume.h"
+#include <string>
 
 using namespace NEWMAT;
 using namespace FILM;

gaussComparer.h

@@ -9,6 +9,8 @@
 #if !defined(__gaussComparer_h)
 #define __gaussComparer_h
 
+#include <iostream>
+#include <fstream>
 #define WANT_STREAM
 #define WANT_MATH
 

glim.cc

@@ -6,6 +6,7 @@
 
 /*  CCOPYRIGHT  */
 
+#include <strstream>
 
 #include "glim.h"
 #include "miscmaths/miscmaths.h"

glim.h

@@ -6,6 +6,8 @@
 
 /*  CCOPYRIGHT  */
 
+#include <iostream>
+#include <fstream>
 #define WANT_STREAM
 #define WANT_MATH
 

glimGls.cc

@@ -6,6 +6,7 @@
 
 /*  CCOPYRIGHT  */
 
+#include <strstream>
 
 #include "glimGls.h"
 #include "miscmaths/miscmaths.h"

glimGls.h

@@ -9,6 +9,8 @@
 #if !defined(__glimgls_h)
 #define __glimgls_h
 
+#include <iostream>
+#include <fstream>
 #define WANT_STREAM
 #define WANT_MATH
 

glm.h

@@ -9,6 +9,8 @@
 #if !defined(__glm_h)
 #define __glm_h
 
+#include <iostream>
+#include <fstream>
 #define WANT_STREAM
 #define WANT_MATH
 

glmrand.cc

@@ -13,6 +13,8 @@
 #include "miscmaths/t2z.h"
 #define __STL_NO_DRAND48
 
+#include <vector.h>
+#include <algo.h>
 
 #ifndef NO_NAMESPACE
 using namespace MISCMATHS;

glmrand.h

@@ -9,6 +9,8 @@
 #if !defined(__glmRand_h)
 #define __glmRand_h
 
+#include <iostream>
+#include <fstream>
 #define WANT_STREAM
 #define WANT_MATH
 

paradigm.cc

@@ -7,8 +7,8 @@
 /*  CCOPYRIGHT  */
 
 #include "paradigm.h"
-#include "log.h"
-#include "miscmaths.h"
+#include "utils/log.h"
+#include "miscmaths/miscmaths.h"
 #include <fstream>
 
 using namespace FILM;

paradigm.h

@@ -11,8 +11,8 @@
 
 #include <iostream>
 #include <fstream>
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include <string>
 
 using namespace NEWMAT;

quick.cc

@@ -5,18 +5,18 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include <string>
 #include <math.h>
 #include "glmrand.h"
 #include "Volume.h"
-#include "log.h"
+#include "utils/log.h"
 #include "histogram.h"
-#include "t2z.h"
-#include "f2z.h"
-#include "miscmaths.h"
-#include "libprob.h"
+#include "miscmaths/t2z.h"
+#include "miscmaths/f2z.h"
+#include "miscmaths/miscmaths.h"
+#include "libprob/libprob.h"
 #include <time.h>
 
 using namespace Utilities;

ttologp.cc

@@ -11,13 +11,13 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 
-#include "t2z.h"
+#include "miscmaths/t2z.h"
 #include "Volume.h"
 #include <string>
-#include "miscmaths.h"
+#include "miscmaths/miscmaths.h"
 
 using namespace NEWMAT;
 using namespace FILM;

ttoz.cc

@@ -11,11 +11,11 @@
 #define WANT_STREAM
 #define WANT_MATH
 
-#include "newmatap.h"
-#include "newmatio.h"
-#include "miscmaths.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
+#include "miscmaths/miscmaths.h"
 
-#include "t2z.h"
+#include "miscmaths/t2z.h"
 #include "Volume.h"
 #include <string>