Fixed include paths for headers

meldata.cc

@@ -9,12 +9,11 @@
 
 /*  CCOPYRIGHT  */
 
-#include "newimageall.h"
+#include "newimage/newimageall.h"
 #include "meloptions.h"
 #include "meldata.h"
 #include "melodic.h"
-#include "log.h"
-#include <time.h>
+#include "utils/log.h"
 
 using namespace Utilities;
 using namespace NEWIMAGE;

meldata.h

@@ -13,8 +13,8 @@
 #ifndef __MELODICDATA_h
 #define __MELODICDATA_h
 
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "meloptions.h"
 
 using namespace Utilities;

melgmix.cc

@@ -9,15 +9,14 @@
 
 /*  CCOPYRIGHT */
 
-#include "newimageall.h"
+#include "newimage/newimageall.h"
 //#include "melmmopts.h"
 #include "melgmix.h"
 //#include "melmm.h"
-#include "log.h"
-#include "miscprob.h"
-#include <time.h>
-#include "miscplot.h"
-#include "miscpic.h"
+#include "utils/log.h"
+#include "miscmaths/miscprob.h"
+#include "libvis/miscplot.h"
+#include "libvis/miscpic.h"
 
 
 using namespace Utilities;

melgmix.h

@@ -12,10 +12,10 @@
 #ifndef __MELGMIX_h
 #define __MELGMIX_h
 
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "melodic.h"
-#include "options.h"
+#include "utils/options.h"
 #include "meloptions.h"
 //#include "melreport.h"
 

melica.cc

@@ -9,17 +9,16 @@
 
 /*  CCOPYRIGHT  */
 
-#include <stdlib.h>
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "meloptions.h"
 #include "meldata.h"
 #include "melodic.h"
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include "melica.h"
 #include "melpca.h"
-#include "miscprob.h"
+#include "miscmaths/miscprob.h"
 
 using namespace Utilities;
 using namespace NEWIMAGE;

melica.h

@@ -11,14 +11,14 @@
 
 #ifndef __MELODICICA_h
 #define __MELODICICA_h
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "melpca.h"
 #include "meloptions.h"
 #include "meldata.h"
 #include "melodic.h"
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include "melreport.h"
 
 using namespace Utilities;

melodic.cc

@@ -9,16 +9,13 @@
 
 /*  CCOPYRIGHT  */
 
-#include <iostream>
-#include "newmatap.h"
-#include "newmatio.h"
-#include "newimageall.h"
-#include "miscmaths.h"
-#include "miscprob.h"
-#include <string>
-#include <math.h>
-#include "options.h"
-#include "log.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
+#include "newimage/newimageall.h"
+#include "miscmaths/miscmaths.h"
+#include "miscmaths/miscprob.h"
+#include "utils/options.h"
+#include "utils/log.h"
 #include "meloptions.h"
 #include "meldata.h"
 #include "melpca.h"

melodic.h

@@ -12,7 +12,6 @@
 #ifndef __MELODIC_h
 #define __MELODIC_h
 
-#include<strstream>
 
 // a simple message macro that takes care of cout and log
 #define message(msg) { \

meloptions.cc

@@ -10,13 +10,9 @@
 
 /*  CCOPYRIGHT  */
 
-#include <iostream>
-#include <fstream>
-#include <stdlib.h>
-#include <stdio.h>
-#include "log.h"
+#include "utils/log.h"
 #include "meloptions.h"
-#include "newimageall.h"
+#include "newimage/newimageall.h"
 
 using namespace Utilities;
 using namespace NEWIMAGE;

meloptions.h

@@ -14,14 +14,8 @@
 #ifndef __MELODICOPTIONS_h
 #define __MELODICOPTIONS_h
 
-#include <string>
-#include <strstream>
-#include <iostream>
-#include <fstream>
-#include <stdlib.h>
-#include <stdio.h>
-#include "options.h"
-#include "log.h"
+#include "utils/options.h"
+#include "utils/log.h"
 #include "melodic.h"
 
 

melpca.cc

@@ -9,15 +9,15 @@
 
 /*  CCOPYRIGHT  */
 
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "meloptions.h"
 #include "meldata.h"
 #include "melodic.h"
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 #include "melpca.h"
-#include "libprob.h"
+#include "libprob/libprob.h"
 
 using namespace Utilities;
 using namespace NEWIMAGE;

melpca.h

@@ -11,14 +11,14 @@
 
 #ifndef __MELODICPCA_h
 #define __MELODICPCA_h
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "meloptions.h"
 #include "meldata.h"
 #include "melodic.h"
 //#include "melreport.h"
-#include "newmatap.h"
-#include "newmatio.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
 
 using namespace Utilities;
 using namespace NEWIMAGE;

melreport.cc

@@ -9,8 +9,8 @@
 
 /*  CCOPYRIGHT  */
 
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "melreport.h"
 
 namespace Melodic{

melreport.h

@@ -12,20 +12,18 @@
 
 #ifndef __MELODICREPORT_h
 #define __MELODICREPORT_h
-#include "newimageall.h"
-#include "log.h"
+#include "newimage/newimageall.h"
+#include "utils/log.h"
 #include "melpca.h"
 #include "meloptions.h"
 #include "meldata.h"
 #include "melgmix.h"
 #include "melodic.h"
-#include "newmatap.h"
-#include "newmatio.h"
-#include <time.h>
-#include <strstream>
-#include "miscplot.h"
-#include "miscpic.h"
-#include "options.h"
+#include "newmat/newmatap.h"
+#include "newmat/newmatio.h"
+#include "libvis/miscplot.h"
+#include "libvis/miscpic.h"
+#include "utils/options.h"
 
 using namespace Utilities;
 using namespace NEWIMAGE;

test.cc

-#include <iostream.h>
-#include <iomanip>
-#include "miscplot.h"
-#include "miscpic.h"
+#include "libvis/miscplot.h"
+#include "libvis/miscpic.h"