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

Isolating bug

Browse Source 
Not writing demand section of input file should eliminate it
This commit is contained in:
michaeltryby
2019-04-22 12:47:52 -04:00
parent ca097a948b
commit c98a43e72c
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/inpfile.c
View File

@@ -371,7 +371,7 @@ int saveinpfile(Project *pr, const char *fname)
// Write [DEMANDS] section
write_demands(pr, f);
//write_demands(pr, f);
// Write [EMITTERS] section

14
tests/test_demand.cpp
View File

@@ -66,15 +66,15 @@ BOOST_AUTO_TEST_CASE(test_categories_reopen, * boost::unit_test::depends_on("tes
error = EN_getnodeindex(ph, (char *)"12", &Nindex);
BOOST_REQUIRE(error == 0);
error = EN_getnumdemands(ph, Nindex, &ndem);
BOOST_REQUIRE(error == 0);
BOOST_CHECK(ndem == 1);
//error = EN_getnumdemands(ph, Nindex, &ndem);
//BOOST_REQUIRE(error == 0);
//BOOST_CHECK(ndem == 1);
char demname[31];
error = EN_getdemandname(ph, Nindex, ndem, demname);
BOOST_REQUIRE(error == 0);
//char demname[31];
//error = EN_getdemandname(ph, Nindex, ndem, demname);
//BOOST_CHECK(error == 0);
BOOST_CHECK(check_string(demname, "CUB_SCOUT_MOTOR_POOL"));
//BOOST_CHECK(check_string(demname, "CUB_SCOUT_MOTOR_POOL"));
error = EN_close(ph);
BOOST_REQUIRE(error == 0);

10
tests/test_project.cpp
View File

@@ -78,13 +78,13 @@ BOOST_AUTO_TEST_CASE(test_save)
error = EN_open(ph_save, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT);
BOOST_REQUIRE(error == 0);
// error = EN_saveinpfile(ph_save, "test_reopen.inp");
// BOOST_REQUIRE(error == 0);
error = EN_saveinpfile(ph_save, "test_reopen.inp");
BOOST_REQUIRE(error == 0);
// BOOST_CHECK(boost::filesystem::exists("test_reopen.inp") == true);
BOOST_CHECK(boost::filesystem::exists("test_reopen.inp") == true);
error = EN_close(ph_save);
BOOST_REQUIRE(error == 0);
error = EN_close(ph_save);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph_save);
}