Reorganization of include files. Added missing license.

include/polynom.h → attic/polynom.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_POLYNOM_H_
+#ifdef _SPEL_POLYNOM_H_
+#error "_SPEL_POLYNOM_H_ already defined!"
+#else
 #define _SPEL_POLYNOM_H_
 
 #include <vector>

include/population.h → attic/population.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_POP_H_
+#ifdef _SPEL_POP_H_
+#error "_SPEL_POP_H_ already defined!"
+#else
 #define _SPEL_POP_H_
 
 #include "polynom.h"

include/proba_config.h → attic/proba_config.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_PROBA_CONFIG_H_
+#ifdef _SPEL_PROBA_CONFIG_H_
+#error "_SPEL_PROBA_CONFIG_H_ already defined!"
+#else
 #define _SPEL_PROBA_CONFIG_H_
 
 /*#define LOCUS_VECTOR_IS_ABUNDANCE*/

include/probabilities.h → attic/probabilities.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_GENOPROBA_H_
+#ifdef _SPEL_GENOPROBA_H_
+#error "_SPEL_GENOPROBA_H_ already defined!"
+#else
 #define _SPEL_GENOPROBA_H_
 
 /*#include <Eigen/Core>*/

include/probapop_dtd.h → attic/probapop_dtd.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_PROBA_DTD_H_
+#ifdef _SPEL_PROBA_DTD_H_
+#error "_SPEL_PROBA_DTD_H_ already defined!"
+#else
 #define _SPEL_PROBA_DTD_H_
 
 /*#include <Eigen/Core>*/

include/progress_display.h → attic/progress_display.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_PROGRESS_DISPLAY_H_
+#ifdef _SPEL_PROGRESS_DISPLAY_H_
+#error "_SPEL_PROGRESS_DISPLAY_H_ already defined!"
+#else
 #define _SPEL_PROGRESS_DISPLAY_H_
 
 struct progress_display {

include/model/qtl_model.h → attic/qtl_model.h

@@ -15,10 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_QTL_MODEL_H_
+#ifdef _SPEL_QTL_MODEL_H_
+#error "_SPEL_QTL_MODEL_H_ already defined!"
+#else
 #define _SPEL_QTL_MODEL_H_
 
-#include "model.h"
+#include "model/model.h"
 
 /* comment gérer des QTLs joints et disjoints ? */
 

include/recursive_map.h → attic/recursive_map.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_RECURSIVE_MAP_H_
+#ifdef _SPEL_RECURSIVE_MAP_H_
+#error "_SPEL_RECURSIVE_MAP_H_ already defined!"
+#else
 #define _SPEL_RECURSIVE_MAP_H_
 
 template <typename TupleType>

include/computations/report_frontend.h → attic/report_frontend.h

@@ -15,7 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _SPEL_REPORT_FRONTEND_H_
+#ifdef _SPEL_REPORT_FRONTEND_H_
+#error "_SPEL_REPORT_FRONTEND_H_ already defined!"
+#else
 #define _SPEL_REPORT_FRONTEND_H_
 
 #include "computations/frontends4.h"