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

get/set demand name are passing

Browse Source
This commit is contained in:
Michael Tryby
2019-04-18 17:07:50 -04:00
parent 901a802f21
commit 76b6254f33
2 changed files with 60 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/epanet.c
View File

@@ -2758,10 +2758,10 @@ int DLLEXPORT EN_getnumdemands(EN_Project p, int nodeIndex, int *numDemands)
// Count the number of demand categories
list_t *demand_list = p->network.Node[nodeIndex].D;
if (!demand_list)
*numDemands = 0;
if (demand_list)
*numDemands = size_list(demand_list);
else
*numDemands = size_list(demand_list);
*numDemands = 0;
return 0;
}
@@ -2842,6 +2842,7 @@ int DLLEXPORT EN_getdemandname(EN_Project p, int nodeIndex, int demandIndex,
{
//Pdemand d;
//int n = 1;
char *temp = NULL;
strcpy(demandName, "");
@@ -2855,14 +2856,18 @@ int DLLEXPORT EN_getdemandname(EN_Project p, int nodeIndex, int demandIndex,
if (!lnode)
return 253;
else
demandName = get_category_name(lnode);
temp = get_category_name(lnode);
//for (d = p->network.Node[nodeIndex].D;
// n < demandIndex && d->next != NULL; d = d->next) n++;
//if (n != demandIndex) return 253;
//if (d->Name) strcpy(demandName, d->Name);
//else demandName[0] = '\0';
if (temp) {
strcpy(demandName, temp);
//else demandName[0] = '\0';
free(temp);
}
return 0;
}

48
tests/test_demand_data.cpp
View File

@@ -158,4 +158,52 @@ BOOST_AUTO_TEST_CASE(test_openclose)
}
#define DATA_PATH_NET1 "./net1.inp"
#define DATA_PATH_TMP "./tmp.inp"
#define DATA_PATH_RPT "./test.rpt"
#define DATA_PATH_OUT "./test.out"
struct FixtureOpenClose {
FixtureOpenClose() {
error = 0;
ph = NULL;
EN_createproject(&ph);
error = EN_open(ph, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT);
}
~FixtureOpenClose() {
error = EN_close(ph);
EN_deleteproject(&ph);
}
int error;
EN_Project ph;
};
BOOST_FIXTURE_TEST_CASE(test_demandname_getset, FixtureOpenClose)
{
int Nindex, ndem;
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);
char demname[31];
error = EN_getdemandname(ph, Nindex, ndem, demname);
BOOST_REQUIRE(error == 0);
BOOST_CHECK(check_string(demname, "\0"));
error = EN_setdemandname(ph, Nindex, ndem, (char *)"Demand category name");
BOOST_REQUIRE(error == 0);
error = EN_getdemandname(ph, Nindex, ndem, demname);
BOOST_REQUIRE(error == 0);
BOOST_CHECK(check_string(demname, "Demand category name"));
}
BOOST_AUTO_TEST_SUITE_END()