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

Merge pull request #431 from Mariosmsk/fix_bug_getdemandname

Browse Source 
try to fix bug in EN_getdemandname
This commit is contained in:
Michael Tryby
2019-04-08 16:26:33 -04:00
committed by GitHub
parent a72e2dc46c 700110ccfd
commit 8b4727eac5
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/epanet.c
View File

@@ -2812,7 +2812,9 @@ int DLLEXPORT EN_getdemandname(EN_Project p, int nodeIndex, int demandIndex,
for (d = p->network.Node[nodeIndex].D; for (d = p->network.Node[nodeIndex].D;
n < demandIndex && d->next != NULL; d = d->next) n++; n < demandIndex && d->next != NULL; d = d->next) n++;
if (n != demandIndex) return 253; if (n != demandIndex) return 253;
strcpy(demandName, d->Name);
if (d->Name) strcpy(demandName, d->Name);
else demandName[0] = '\0';
return 0; return 0;
} }
@@ -2835,11 +2837,14 @@ int DLLEXPORT EN_setdemandname(EN_Project p, int nodeIndex, int demandIndex,
if (!p->Openflag) return 102; if (!p->Openflag) return 102;
if (nodeIndex <= 0 || nodeIndex > p->network.Njuncs) return 203; if (nodeIndex <= 0 || nodeIndex > p->network.Njuncs) return 203;
// Check that demandName is not too long
if (strlen(demandName) > MAXID) return 250;
// Locate demand category record and assign demandName to it // Locate demand category record and assign demandName to it
for (d = p->network.Node[nodeIndex].D; for (d = p->network.Node[nodeIndex].D;
n < demandIndex && d->next != NULL; d = d->next) n++; n < demandIndex && d->next != NULL; d = d->next) n++;
if (n != demandIndex) return 253; if (n != demandIndex) return 253;
d->Name = xstrcpy(&d->Name, demandName, MAXMSG); d->Name = xstrcpy(&d->Name, demandName, MAXID);
return 0; return 0;
} }

34
tests/test_demand.cpp
View File

@@ -20,7 +20,7 @@ BOOST_AUTO_TEST_SUITE (test_demand)
BOOST_AUTO_TEST_CASE(test_categories_save) BOOST_AUTO_TEST_CASE(test_categories_save)
{ {
int error = 0; int error = 0;
int Nindex, ndem; int Nindex, ndem;
EN_Project ph = NULL; EN_Project ph = NULL;
@@ -34,15 +34,19 @@ BOOST_AUTO_TEST_CASE(test_categories_save)
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
BOOST_CHECK(ndem == 1); BOOST_CHECK(ndem == 1);
error = EN_setdemandname(ph, Nindex, ndem, (char *)"Demand category name"); char demname[31];
error = EN_getdemandname(ph, Nindex, ndem, demname);
BOOST_REQUIRE(error == 0);
error = EN_setdemandname(ph, Nindex, ndem, (char *)"Demand category name");
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_saveinpfile(ph, "net1_dem_cat.inp"); error = EN_saveinpfile(ph, "net1_dem_cat.inp");
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_close(ph); error = EN_close(ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_deleteproject(&ph); error = EN_deleteproject(&ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
} }
BOOST_AUTO_TEST_CASE(test_categories_reopen, * boost::unit_test::depends_on("test_demand/test_categories_save")) BOOST_AUTO_TEST_CASE(test_categories_reopen, * boost::unit_test::depends_on("test_demand/test_categories_save"))
@@ -52,11 +56,11 @@ BOOST_AUTO_TEST_CASE(test_categories_reopen, * boost::unit_test::depends_on("tes
EN_Project ph = NULL; EN_Project ph = NULL;
BOOST_TEST_CHECKPOINT("Reopening saved input file"); BOOST_TEST_CHECKPOINT("Reopening saved input file");
error = EN_createproject(&ph); error = EN_createproject(&ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_open(ph, "net1_dem_cat.inp", DATA_PATH_RPT, DATA_PATH_OUT); error = EN_open(ph, "net1_dem_cat.inp", DATA_PATH_RPT, DATA_PATH_OUT);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_getnodeindex(ph, (char *)"12", &Nindex); error = EN_getnodeindex(ph, (char *)"12", &Nindex);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
@@ -64,16 +68,16 @@ BOOST_AUTO_TEST_CASE(test_categories_reopen, * boost::unit_test::depends_on("tes
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
BOOST_CHECK(ndem == 1); BOOST_CHECK(ndem == 1);
char demname[80]; char demname[31];
error = EN_getdemandname(ph, Nindex, ndem, demname); error = EN_getdemandname(ph, Nindex, ndem, demname);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
BOOST_CHECK(check_string(demname, "Demand category name")); BOOST_CHECK(check_string(demname, "Demand category name"));
error = EN_close(ph); error = EN_close(ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_deleteproject(&ph); error = EN_deleteproject(&ph);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()