CMakeList

CMakeLists.txt

@@ -0,0 +1,109 @@
+cmake_minimum_required(VERSION 3.00)
+project(cybiosphere)
+
+set(SOURCE Evolution.cpp 
+    ./WpCommon/src/Definitions.cpp 
+    ./WpCommon/src/CCustomParam.cpp
+    ./WpCommon/src/CGenericParam.cpp
+    ./WpCommon/src/CGenericCaract.cpp
+    ./WpCommon/src/CCyclicParam.cpp
+    ./WpBehavior/src/CBrain.cpp
+    ./WpBehavior/src/CBrainAnimal.cpp
+    ./WpBehavior/src/CFeelingFear.cpp
+    ./WpBehavior/src/CFeelingWelfare.cpp
+    ./WpBehavior/src/CGeoMapPurpose.cpp
+    ./WpBehavior/src/CNeuronMatrix.cpp
+    ./WpBehavior/src/CPurpose.cpp
+    ./WpBehavior/src/CReaction.cpp
+    ./WpBehavior/src/CReactionAttack.cpp
+    ./WpBehavior/src/CReactionCopulate.cpp
+    ./WpBehavior/src/CReactionDrink.cpp
+    ./WpBehavior/src/CReactionEat.cpp
+    ./WpBehavior/src/CReactionHide.cpp
+    ./WpBehavior/src/CReactionNothing.cpp
+    ./WpBehavior/src/CReactionRuminate.cpp
+    ./WpBehavior/src/CReactionSleep.cpp
+    ./WpBehavior/src/CReactionStepBackward.cpp
+    ./WpBehavior/src/CReactionTurnHeadLeft.cpp
+    ./WpBehavior/src/CReactionTurnHeadRight.cpp
+    ./WpBehavior/src/CReactionTurnLeft.cpp
+    ./WpBehavior/src/CReactionTurnRight.cpp
+    ./WpBehavior/src/CReactionVarySpeed.cpp
+    ./WpBehavior/src/CSensor.cpp
+    ./WpBehavior/src/CSensorCompass.cpp
+    ./WpBehavior/src/CSensorComposite.cpp
+    ./WpBehavior/src/CSensorEar.cpp
+    ./WpBehavior/src/CSensorFear.cpp
+    ./WpBehavior/src/CSensorHormone.cpp
+    ./WpBehavior/src/CSensorHunger.cpp
+    ./WpBehavior/src/CSensorLibido.cpp
+    ./WpBehavior/src/CSensorMemoryAction.cpp
+    ./WpBehavior/src/CSensorMemoryFeedback.cpp
+    ./WpBehavior/src/CSensorObscurity.cpp
+    ./WpBehavior/src/CSensorOrientation.cpp
+    ./WpBehavior/src/CSensorPheromone.cpp
+    ./WpBehavior/src/CSensorPleasure.cpp
+    ./WpBehavior/src/CSensorSmell.cpp
+    ./WpBehavior/src/CSensorSpeed.cpp
+    ./WpBehavior/src/CSensorStatic.cpp
+    ./WpBehavior/src/CSensorStomachOverload.cpp
+    ./WpBehavior/src/CSensorSuffering.cpp
+    ./WpBehavior/src/CSensorTactile.cpp
+    ./WpBehavior/src/CSensorTaste.cpp
+    ./WpBehavior/src/CSensorTemperature.cpp
+    ./WpBehavior/src/CSensorThirst.cpp
+    ./WpBehavior/src/CSensorTiredness.cpp
+    ./WpBehavior/src/CSensorView.cpp
+    ./WpBehavior/src/CSensorViewFar.cpp
+    ./WpBehavior/src/CSensorViewIdentify.cpp
+    ./WpBehavior/src/CSensorViewIdentifyFar.cpp	
+    ./WpEntity/src/CAnimal.cpp
+    ./WpEntity/src/CAnimMammal.cpp
+    ./WpEntity/src/CBasicEntity.cpp
+    ./WpEntity/src/CEntityFactory.cpp
+    ./WpEntity/src/CGrass.cpp
+    ./WpEntity/src/CLifeStage.cpp
+    ./WpEntity/src/CMineral.cpp
+    ./WpEntity/src/CPhysicalWelfare.cpp
+    ./WpEntity/src/CRock.cpp
+    ./WpEntity/src/CVegetable.cpp
+    ./WpEntity/src/CVegetSpermatophyta.cpp
+    ./WpEntity/src/CWater.cpp
+    ./WpEnvironment/src/CBiotop.cpp
+    ./WpEnvironment/src/CGeoMap.cpp
+    ./WpEnvironment/src/CIdentifyChecker.cpp
+    ./WpEnvironment/src/CScenarioPlayer.cpp
+    ./WpGenetic/src/CChromosome.cpp
+    ./WpGenetic/src/CGene.cpp
+    ./WpGenetic/src/CGeneDefinitions.cpp
+    ./WpGenetic/src/CGeneticParam.cpp
+    ./WpGenetic/src/CGenome.cpp
+    ./WpGenetic/src/CPairOfChromosome.cpp
+    ./WpMeasure/src/CGeoMapPopulation.cpp	
+    ./WpMeasure/src/CMeasure.cpp
+    ./WpMeasure/src/CMeasureBiotopParam.cpp
+    ./WpMeasure/src/CMeasureEntityParam.cpp
+    ./WpMeasure/src/CMeasureFeeling.cpp
+    ./WpMeasure/src/CMeasureParam.cpp
+    ./WpMeasure/src/CMeasurePopulation.cpp
+    ./WpMeasure/src/CMeasureReaction.cpp
+    ./WpTinyXml/src/tinystr.cpp
+    ./WpTinyXml/src/tinyxml.cpp
+    ./WpTinyXml/src/tinyxmlerror.cpp
+    ./WpTinyXml/src/tinyxmlparser.cpp)
+
+add_compile_definitions(TIXML_USE_STL CYBIOCORE_LOG_IN_FILE)
+add_link_options(-pthread -fopenmp)
+
+add_executable(${PROJECT_NAME} ${SOURCE})
+
+set(COMMON_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/WpCommon/inc
+                       ${CMAKE_CURRENT_SOURCE_DIR}/WpEntity/inc
+                       ${CMAKE_CURRENT_SOURCE_DIR}/WpGenetic/inc
+                       ${CMAKE_CURRENT_SOURCE_DIR}/WpBehavior/inc
+                       ${CMAKE_CURRENT_SOURCE_DIR}/WpMeasure/inc
+                       ${CMAKE_CURRENT_SOURCE_DIR}/WpEnvironment/inc
+                       ${CMAKE_CURRENT_SOURCE_DIR}/WpTinyXml/inc)
+
+target_include_directories(${PROJECT_NAME} PUBLIC "${COMMON_INCLUDE_DIR}")
+

WpCommon/inc/CGenericParam.h

@@ -48,7 +48,7 @@ distribution.
 
 #include "Definitions.h"
 #include "CybioXmlDef.h"
-#include "CGene.h"
+#include "CGeneDefinitions.h"
 
 //===========================================================================
 // Definitions            

WpEnvironment/src/CBiotop.cpp

@@ -288,8 +288,6 @@ CBasicEntity* CBiotop::createAndAddEntity(string fileName, string pathName, Poin
 
 CBasicEntity* CBiotop::createAndAddEntity(TiXmlDocument *pXmlDoc, Point_t coord, size_t layer)
 {
-
-
   // Create entity
   CBasicEntity* pNewEntity = CEntityFactory::createEntity(pXmlDoc);
   if (pNewEntity == NULL)
@@ -1545,7 +1543,6 @@ void CBiotop::nextDay(void)
   }
 }
 
-
 void CBiotop::nextHourForAllEntities(void)
 {
   CBasicEntity* pEntity = NULL;
@@ -2319,7 +2316,6 @@ bool CBiotop::saveInXmlFile(string fileName, string pathName, bool saveEntities)
   resu = pXmlDoc->SaveFile();
   delete pXmlDoc;
   return resu;
-
 }
 
 bool CBiotop::saveInXmlFile(TiXmlDocument *pXmlDoc, string pathNameForEntities, bool saveEntityList, bool saveEntities)
@@ -2446,7 +2442,6 @@ bool CBiotop::saveInXmlFile(TiXmlDocument *pXmlDoc, string pathNameForEntities,
   return true;
 }
 
-
 bool CBiotop::loadFromXmlFile(string fileName, string pathName)
 {
   TiXmlDocument xmlDoc(pathName + fileName);