Remove NodeCount from demographics (#150)

Author: kfrey-idm

Eradication/NodeDemographics.cpp

@@ -440,18 +440,6 @@ void NodeDemographicsFactory::Initialize( const ::Configuration* config,
                 }
                 JsonObjectDemog metadata = json["Metadata"] ;
 
-                if( !metadata.Contains( "NodeCount" ) )
-                {
-                    throw NodeDemographicsFormatErrorException( __FILE__, __LINE__, __FUNCTION__, demo_filename.c_str(), "Missing the 'Metadata.NodeCount' object." );
-                }
-
-                int nodecount = metadata.GetInt("NodeCount");
-                if( nodecount <= 0 )
-                {
-                    std::stringstream msg ;
-                    msg << "'NodeCount' = " << nodecount << ".  It must be positive." ;
-                    throw NodeDemographicsFormatErrorException( __FILE__, __LINE__, __FUNCTION__, demo_filename.c_str(), msg.str().c_str() );
-                }
                 SetIdReference( layer, demo_filename, metadata );
 
                 // ------------------------------------------------------------------
@@ -851,7 +839,6 @@ void NodeDemographicsFactory::WriteDefaultDemographicsFile( const std::string& r
            <<          "Tool" << "Eradication.exe"
            <<          "Author" << "DTK"
            <<          "IdReference" << idreference.c_str()
-           <<          "NodeCount" << nodeIDs.size()
            <<     '}'
            <<     "Defaults" << layer_defaults[0]
            <<     "Nodes"

componentTests/NodeDemographicsTest.cpp

@@ -300,18 +300,6 @@ SUITE(NodeDemographicsTest)
                                               "Failed to parse incoming text. Name of an object member must be a string" );
     }
 
-    TEST_FIXTURE(NodeDemographicsFactoryFixture, TestNoNodeCount)
-    {
-        TestHelper_FormatException( __LINE__, "demographics_TestNoNodeCount.json", 
-                                              "Format error encountered loading demographics file (testdata/NodeDemographicsTest/demographics_TestNoNodeCount.json).  Missing the 'Metadata.NodeCount' object." );
-    }
-
-    TEST_FIXTURE(NodeDemographicsFactoryFixture, TestZeroNodecount)
-    {
-        TestHelper_FormatException( __LINE__, "demographics_TestZeroNodeCount.json", 
-                                              "Format error encountered loading demographics file (testdata/NodeDemographicsTest/demographics_TestZeroNodeCount.json).  'NodeCount' = 0.  It must be positive." );
-    }
-
     TEST_FIXTURE(NodeDemographicsFactoryFixture, TestMissingIdReference)
     {
         TestHelper_FormatException( __LINE__, "demographics_TestMissingIdReference.json", 
@@ -353,32 +341,6 @@ SUITE(NodeDemographicsTest)
         TestHelper_FormatException( __LINE__, "demographics_TestStringTableBadFormat.json", 
                                               "Failed to parse incoming text. Expect a value here. at character=991 / line number=0" );
     }
-    
-#ifdef USE_NODEOFFSET
-    TEST_FIXTURE(NodeDemographicsFactoryFixture, TestBadIdInNodeOffset)
-    {
-        TestHelper_MissingAttributes_FormatException( __LINE__, "demographics_TestBadIdInNodeOffset.json",
-                                                                "Format error encountered loading demographics file (UNKNOWN).  NodeID for lookup (2457) does not equal the NodeID (1) found in the data.  Is NodeOffset messed up?");
-    }
-
-    TEST_FIXTURE(NodeDemographicsFactoryFixture, TestBadOffsetInNodeOffset)
-    {
-        TestHelper_MissingAttributes_FormatException( __LINE__, "demographics_TestBadOffsetInNodeOffset.json",
-                                                                "Format error encountered loading demographics file (testdata/NodeDemographicsTest/demographics_TestBadOffsetInNodeOffset.json).  NodeID for lookup (1) does not have data at offset 4095.  Is NodeOffset messed up?");
-    }
-    
-    TEST_FIXTURE(NodeDemographicsFactoryFixture, TestBadNodeOffsetNot16)
-    {
-        TestHelper_FormatException( __LINE__, "demographics_TestBadNodeOffsetNot16.json",
-                                              "Format error encountered loading demographics file (testdata/NodeDemographicsTest/demographics_TestBadNodeOffsetNot16.json).  Length of 'NodeOffsets' isn't consistent with 'NodeCount' attribute." );
-    }
-    
-    TEST_FIXTURE(NodeDemographicsFactoryFixture, TestBadNodeOffsetNc2) //offset is for two nodes while nodecount=1
-    {
-        TestHelper_FormatException( __LINE__, "demographics_TestBadNodeOffsetNc2.json", 
-                                              "Format error encountered loading demographics file (testdata/NodeDemographicsTest/demographics_TestBadNodeOffsetNc2.json).  Length of 'NodeOffsets' isn't consistent with 'NodeCount' attribute." );
-    }
-#endif
 
     TEST_FIXTURE(NodeDemographicsFactoryFixture, TestMisingNodeAttributes)
     {
@@ -1622,9 +1584,6 @@ SUITE(NodeDemographicsTest)
         JsonObjectDemog default_demog_json ;
         default_demog_json.ParseFile( default_fn.c_str() );
 
-        int num_nodes = default_demog_json["Metadata"]["NodeCount"].AsInt();
-        CHECK_EQUAL( 100, num_nodes );
-
         for( int i = 0 ; i < nodeIDs.size() ; i++ )
         {
             uint32_t data_node_id = nodeIDs[i] ;

componentTests/testdata/NodeDemographicsTest/demographics_TestBadIdInNodeOffset.json

@@ -4,7 +4,6 @@
 #define Author_DESC_TEXT "The person who created the demographics file. EMOD does not use this value."
 #define DateCreated_DESC_TEXT "The date the demographics file was created. EMOD does not use this value."
 #define IdReference_DESC_TEXT "The identifier for a simulation; all input files (except configuration and campaign files) used in a simulation must have the same IdReference value."
-#define NodeCount_DESC_TEXT "The number of nodes to expect in the input files."
 #define Tool_DESC_TEXT "The software tool used to create the demographics file. EMOD does not use this value."
 #define Resolution_DESC_TEXT "The spatial resolution of the demographics file."