Reports cleaning

Author: kfrey-idm

baseReportLib/ReportFactory.cpp Eradication/ReportFactory.cppbaseReportLib/ReportFactory.cpp renamed to Eradication/ReportFactory.cpp

@@ -1,9 +1,8 @@
 
 #include "stdafx.h"
-#include "IReport.h"
+#include "ReportFactory.h"
 #include "ObjectFactoryTemplates.h"
 
-
 SETUP_LOGGING( "ReportFactory" )
 
 namespace Kernel

Eradication/ReportFactory.h

@@ -0,0 +1,15 @@
+
+#pragma once
+
+#include <functional>
+#include "FactorySupport.h"
+#include "IReport.h"
+#include "ObjectFactory.h"
+
+namespace Kernel
+{
+
+    class ReportFactory : public ObjectFactory<IReport,ReportFactory>
+    {
+    };
+}

Eradication/SConscript

@@ -40,18 +40,18 @@ else:
         erad_env.Append( LIBPATH = ["$BUILD_DIR/Eradication"] )
         erad_env.Append( LIBS=["/WHOLEARCHIVE:coreLib"] )
         erad_env.Append( LIBS=["/WHOLEARCHIVE:campaign"] )
-        erad_env.Append( LIBS=["/WHOLEARCHIVE:baseReportLib"] )
+        erad_env.Append( LIBS=["/WHOLEARCHIVE:reporters"] )
     else:
         #NOTE: I couldn't get the use of $BUILD_DIR to work.  It kept putting in an extra '/'. 
         # Need to whole-archive the libraries with factory registration so they're available at run time
         if env["Debug"]:
             erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Debug/Eradication/libcoreLib.a,--no-whole-archive"])
             erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Debug/campaign/libcampaign.a,--no-whole-archive"])
-            erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Debug/baseReportLib/libbaseReportLib.a,--no-whole-archive"])
+            erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Debug/reporters/libreporters.a,--no-whole-archive"])
         else:
             erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Release/Eradication/libcoreLib.a,--no-whole-archive"])
             erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Release/campaign/libcampaign.a,--no-whole-archive"])
-            erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Release/baseReportLib/libbaseReportLib.a,--no-whole-archive"])
+            erad_env.Append(LINKFLAGS=["-Wl,--whole-archive,build/x64/Release/reporters/libreporters.a,--no-whole-archive"])
 
     # Monolithic
     eradicationExe = erad_env.Program('Eradication', eradicationSrcFiles)

Eradication/SConscript_coreLib

@@ -34,38 +34,37 @@ else:
                             "SqlLogger.cpp",
                             "RandomSerializable.cpp",
                             "RandomNumberGeneratorFactory.cpp",
-                            "BroadcasterImpl.cpp",
 
                             # Campaign
+                            "BroadcasterImpl.cpp",
+                            "BroadcastCoordinatorEvent.cpp",
+                            "CalendarEventCoordinator.cpp",
                             "CampaignEvent.cpp",
+                            "DelayEventCoordinator.cpp",
+                            "IncidenceEventCoordinator.cpp",
                             "InterventionsContainer.cpp",
                             "NChooserEventCoordinator.cpp",
                             "NodeEventContext.cpp",
                             "SimulationEventContext.cpp",
                             "StandardEventCoordinator.cpp",
+                            "IncidenceCounterSurveillance.cpp",
+                            "SurveillanceEventCoordinator.cpp",
+                            "TriggeredEventCoordinator.cpp",
                             "CoverageByNodeEventCoordinator.cpp",
                             "CommunityHealthWorkerEventCoordinator.cpp",
                             "DemographicRestrictions.cpp",
                             "PropertyRestrictions.cpp",
-
-                            # Surveillance
-                            "BroadcastCoordinatorEvent.cpp",
-                            "CalendarEventCoordinator.cpp",
-                            "DelayEventCoordinator.cpp",
-                            "IncidenceEventCoordinator.cpp",
-                            "IncidenceCounterSurveillance.cpp",
-                            "SurveillanceEventCoordinator.cpp",
-                            "TriggeredEventCoordinator.cpp",
-                            "ReportSurveillanceEventRecorder.cpp",
 
                             # Reporting
                             "DemographicsReport.cpp",
                             "PropertyReport.cpp",
+                            "ReportFactory.cpp",
                             "Report.cpp",
                             "ReportStatsByIP.cpp",
                             "ReportEventRecorder.cpp",
                             "ReportEventRecorderNode.cpp",
                             "ReportEventRecorderCoordinator.cpp",
+                            "ReportSurveillanceEventRecorder.cpp",
                             "SQLReporter.cpp",
 
                             # HINT
@@ -83,13 +82,13 @@ else:
                             "SpatialReport.cpp",
                             "Susceptibility.cpp",
 
+                            "../interventions/CalendarIV.cpp",
+                            "../interventions/DelayedIntervention.cpp",
+                            "../interventions/Diagnostics.cpp",
                             "../interventions/BroadcastEvent.cpp",
                             "../interventions/BroadcastNodeEvent.cpp",
                             "../interventions/BroadcastEventToOtherNodes.cpp",
-                            "../interventions/CalendarIV.cpp",
                             "../interventions/ChangeIPMatrix.cpp",
-                            "../interventions/DelayedIntervention.cpp",
-                            "../interventions/Diagnostics.cpp",
                             "../interventions/Drugs.cpp",
                             "../interventions/EnvironmentalDiagnostic.cpp",
                             "../interventions/HealthSeekingBehavior.cpp",
@@ -106,9 +105,10 @@ else:
                             "../interventions/NodeRandomNumber.cpp",
                             "../interventions/NLHTIVNode.cpp",
                             "../interventions/NodePropertyValueChanger.cpp",
+                            "../interventions/PropertyValueChanger.cpp",
                             "../interventions/Outbreak.cpp",
                             "../interventions/OutbreakIndividual.cpp",
-                            "../interventions/PropertyValueChanger.cpp",
+
                             "../interventions/TravelRestriction.cpp",
                             "../interventions/Vaccine.cpp",
     ]
@@ -139,12 +139,10 @@ else:
                             "VectorProbabilities.cpp",
                             "VectorSpeciesParameters.cpp",
                             "VectorSpeciesReport.cpp",
-
                             "Climate.cpp",
                             "ClimateByData.cpp",
                             "ClimateConstant.cpp",
                             "ClimateKoppen.cpp",
-
                             "../interventions/Bednet.cpp",
                             "../interventions/BitingRisk.cpp",
                             "../interventions/HousingModification.cpp", 
@@ -334,7 +332,7 @@ else:
                             "../interventions/ModifyStiCoInfectionStatus.cpp",
                             "../interventions/StiCoInfectionDiagnostic.cpp",
                             "../interventions/STIBarrier.cpp",
-                            "../interventions/STIIsPostDebut.cpp"
+                            "../interventions/STIIsPostDebut.cpp",
     ]
 
     # HIV

Eradication/Schema.cpp

@@ -16,6 +16,7 @@
 #include "DllLoader.h"
 #include "EventTrigger.h"
 #include "InterventionFactory.h"
+#include "ReportFactory.h"
 #include "SimulationConfig.h"
 #include "CampaignEvent.h"
 #include "EventCoordinator.h"

Eradication/Simulation.cpp

@@ -33,6 +33,7 @@
 #include "EventTrigger.h"
 #include "RandomNumberGeneratorFactory.h"
 #include "DllLoader.h"
+#include "ReportFactory.h"
 #include "MpiDataExchanger.h"
 #include "IdmMpi.h"
 #include "Properties.h"
@@ -1373,7 +1374,6 @@ namespace Kernel
 
         WithSelfFunc to_self_func = [this](int myRank) 
         { 
-#ifndef _DEBUG
             // Don't bother to serialize locally
             // for (auto individual : migratingIndividualQueues[destination_rank]) // Note the direction of iteration below!
             for (auto iterator = migratingIndividualQueues[myRank].rbegin(); iterator != migratingIndividualQueues[myRank].rend(); ++iterator)
@@ -1387,27 +1387,7 @@ namespace Kernel
                     delete individual;
                 }
             }
-#else
-            if ( migratingIndividualQueues[myRank].size() > 0 )
-            {
-                auto writer = make_shared<BinaryArchiveWriter>();
-                (*static_cast<IArchive*>(writer.get())) & migratingIndividualQueues[myRank];
-
-                for (auto& individual : migratingIndividualQueues[myRank])
-                    delete individual; // individual->Recycle();
-
-                migratingIndividualQueues[myRank].clear();
-
-                auto reader = make_shared<BinaryArchiveReader>(static_cast<IArchive*>(writer.get())->GetBuffer(), static_cast<IArchive*>(writer.get())->GetBufferSize());
-                (*static_cast<IArchive*>(reader.get())) & migratingIndividualQueues[myRank];
-                for (auto individual : migratingIndividualQueues[myRank])
-                {
-                    IMigrate* immigrant = individual->GetIMigrate();
-                    immigrant->ImmigrateTo( nodes[immigrant->GetMigrationDestination()] );
-                }
-            }
-#endif
-        }; 
+        };
 
         SendToOthersFunc to_others_func = [this](IArchive* writer, int toRank)
         {

SConscript

@@ -60,6 +60,7 @@ env.Prepend( CPPPATH=[
 
 # set the common libraries
 env.Prepend( LIBPATH = [
+              "$BUILD_DIR/reporters", 
               "$BUILD_DIR/baseReportLib",
               "$BUILD_DIR/campaign", 
               "$BUILD_DIR/cajun", 
@@ -73,6 +74,7 @@ if 'Disease' in env and len(env['Disease']) > 0:
     disease = env["Disease"]
 
 env.Prepend( LIBS=[
+              "reporters",
               "baseReportLib", 
               "campaign",
               "cajun",
@@ -82,21 +84,20 @@ env.Prepend( LIBS=[
               "utils"])
 
 # First static libs
+print( "Build static libraries." )
 SConscript( [ 'baseReportLib/SConscript',
               'cajun/SConscript',
               'campaign/SConscript',
+              'reporters/SConscript',
               'Eradication/SConscript_coreLib',
               'libsqlite/SConscript',
               'snappy/SConscript',
               'lz4/SConscript',
               'utils/SConscript' ])
 
-
 # Finally executable
 SConscript('Eradication/SConscript')
 
-
-
 #if disease != "Typhoid":
 #    OptionalScript('reporters/SConscript_Generic_AgeAtInfection')
 #    OptionalScript('reporters/SConscript_Generic_AgeAtInfectionHistogram')

SConstruct

@@ -211,30 +211,26 @@ else:
     env['CC'] = "mpicc"
     env['CXX'] = "mpicxx"
     env.Append( CCFLAGS=["-fpermissive"] )
-    env.Append( CCFLAGS=["--std=c++0x"] )
     env.Append( CCFLAGS=["-w"] )
     env.Append( CCFLAGS=["-ffloat-store"] )
     env.Append( CCFLAGS=["-Wno-unknown-pragmas"] )
 
     # Python
-    if(sys.version_info.minor == 9):
-        env.Append( LIBS=["python3.9"] )
-        env.Append( EXTRACPPPATH=["/usr/include/python3.9"] )
-    elif(sys.version_info.minor == 10):
-        env.Append( LIBS=["python3.10"] )
-        env.Append( EXTRACPPPATH=["/usr/include/python3.10"] )
-    elif(sys.version_info.minor == 11):
-        env.Append( LIBS=["python3.11"] )
-        env.Append( EXTRACPPPATH=["/usr/include/python3.11"] )
-    elif(sys.version_info.minor == 12):
-        env.Append( LIBS=["python3.12"] )
-        env.Append( EXTRACPPPATH=["/usr/include/python3.12"] )
+    if(sys.version_info.minor == 14):
+        env.Append( LIBS=["python3.14"] )
+        env.Append( EXTRACPPPATH=["/usr/include/python3.14"] )
     elif(sys.version_info.minor == 13):
         env.Append( LIBS=["python3.13"] )
         env.Append( EXTRACPPPATH=["/usr/include/python3.13"] )
-    elif(sys.version_info.minor == 14):
-        env.Append( LIBS=["python3.14"] )
-        env.Append( EXTRACPPPATH=["/usr/include/python3.14"] )
+    elif(sys.version_info.minor == 12):
+        env.Append( LIBS=["python3.12"] )
+        env.Append( EXTRACPPPATH=["/usr/include/python3.12"] )
+    elif(sys.version_info.minor == 11):
+        env.Append( LIBS=["python3.11"] )
+        env.Append( EXTRACPPPATH=["/usr/include/python3.11"] )
+    elif(sys.version_info.minor == 10):
+        env.Append( LIBS=["python3.10"] )
+        env.Append( EXTRACPPPATH=["/usr/include/python3.10"] )
     else:
         raise RuntimeError("Unsupported python version")
 
@@ -367,8 +363,6 @@ elif "win32" == os.sys.platform:
 else:
     print( "No special config for [" + os.sys.platform + "] which probably means it won't work" )
 
-env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
-
 env.Append( CPPPATH=['$EXTRACPPPATH'] )
 env.Append( LIBPATH=['$EXTRALIBPATH'] )
 

baseReportLib/IReport.h

@@ -6,9 +6,6 @@
 
 #include "Configure.h"
 #include "ExternalNodeId.h"
-#include "FactorySupport.h"
-#include "IdmApi.h"
-#include "ObjectFactory.h"
 
 namespace Kernel
 {
@@ -18,7 +15,7 @@ namespace Kernel
     struct ISimulationContext;
     struct ISimulationEventContext;
 
-    class IDMAPI IReport : public JsonConfigurable
+    class IReport : public JsonConfigurable
     {
     public:
         virtual ~IReport() {} ;
@@ -46,14 +43,10 @@ namespace Kernel
         virtual std::string GetReportName() const = 0;
     };
 
-    class ReportFactory : public ObjectFactory<IReport, ReportFactory>
-    {
-    };
-
     // This abstract class provides a default implementation to some of pure virtual methods
     // of IReport.  This allows other classes to be IReport's
     // without needing the equivalent of the code below.
-    class IDMAPI BaseReport : public IReport
+    class BaseReport : public IReport
     {
     public:
         virtual ~BaseReport(){};

baseReportLib/SConscript

@@ -11,15 +11,10 @@ reportSrcFiles = [
     "BaseTextReportEvents.cpp",
     "BinnedReport.cpp",
     "ChannelDataMap.cpp",
-    "ReportFactory.cpp",
-    "ReportHumanMigrationTracking.cpp",
-    "ReportNodeDemographics.cpp",
-    "ReportStrainTracking.cpp",
     "ReportUtilities.cpp",
 ]
 
 if ('Disease' in env) and ((env['Disease'] == 'Malaria') or (env['Disease'] == '')):
-    reportSrcFiles.append( "ReportNodeDemographicsMalaria.cpp" )
     reportSrcFiles.append( "ReportUtilitiesMalaria.cpp" )
 
 reportLib = env.StaticLibrary('baseReportLib', reportSrcFiles)