JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Update test_demand_data.cpp

Browse Source 
Adding index to addnode calls. Fixing indent
This commit is contained in:
michaeltryby
2019-04-22 13:37:41 -04:00
parent f19d43d3a4
commit a0048b7b09
1 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/test_demand_data.cpp
View File

@@ -1,14 +1,14 @@
/* /*
****************************************************************************** ******************************************************************************
Project: OWA EPANET Project: OWA EPANET
Version: 2.2 Version: 2.2
Module: /test_demand_data.cpp Module: /test_demand_data.cpp
Description: tests demand data list node struct Description: tests demand data list node struct
Authors: see AUTHORS Authors: see AUTHORS
Copyright: see AUTHORS Copyright: see AUTHORS
License: see LICENSE License: see LICENSE
Last Updated: 04/18/2019 Last Updated: 04/18/2019
****************************************************************************** ******************************************************************************
*/ */
#define BOOST_TEST_MODULE demand_data #define BOOST_TEST_MODULE demand_data
@@ -184,15 +184,15 @@ struct FixtureSingleNode {
EN_createproject(&ph); EN_createproject(&ph);
EN_init(ph, DATA_PATH_RPT, DATA_PATH_OUT, EN_GPM, EN_HW); EN_init(ph, DATA_PATH_RPT, DATA_PATH_OUT, EN_GPM, EN_HW);
EN_addnode(ph, (char *)"CUB_SCOUT_QUONSET_HUT", EN_JUNCTION); EN_addnode(ph, (char *)"CUB_SCOUT_QUONSET_HUT", EN_JUNCTION, &node_qhut);
EN_getnodeindex(ph, (char *)"CUB_SCOUT_QUONSET_HUT", &node_qhut); //EN_getnodeindex(ph, (char *)"CUB_SCOUT_QUONSET_HUT", &node_qhut);
} }
~FixtureSingleNode() { ~FixtureSingleNode() {
EN_close(ph); EN_close(ph);
EN_deleteproject(&ph); EN_deleteproject(&ph);
} }
int error, node_qhut; int error, index, node_qhut;
EN_Project ph; EN_Project ph;
}; };
@@ -245,8 +245,8 @@ BOOST_FIXTURE_TEST_CASE(test_pattern_edits, FixtureSingleNode)
{ {
int n, node_cpoint, pat2_idx, pat3_idx; int n, node_cpoint, pat2_idx, pat3_idx;
EN_addnode(ph, (char *)"CUB_SCOUT_CHECKPOINT", EN_JUNCTION); EN_addnode(ph, (char *)"CUB_SCOUT_CHECKPOINT", EN_JUNCTION, &node_cpoint);
EN_getnodeindex(ph, (char *)"CUB_SCOUT_CHECKPOINT", &node_cpoint); //EN_getnodeindex(ph, (char *)"CUB_SCOUT_CHECKPOINT", &node_cpoint);
// Add 2 new patterns // Add 2 new patterns
error = EN_addpattern(ph, (char *)"DefPat"); error = EN_addpattern(ph, (char *)"DefPat");