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

rethinking the python wrapper (#511)

Browse Source 
* renames certain function parameter declarations and removes double pointer call from the deleteproject function

* deprecates conditonal compilation, removes python-specific headers and function renaming

* fixes tests and docs

* fixes test
This commit is contained in:
Sam Hatchett
2019-07-17 15:19:25 -04:00
committed by GitHub
parent 4cc16913df
commit 3fe11b98ee
18 changed files with 216 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_demand.cpp
View File

@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(test_categories_save)
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
error = EN_deleteproject(&ph);
error = EN_deleteproject(ph);
BOOST_REQUIRE(error == 0);
}
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(test_categories_reopen, * boost::unit_test::depends_on("tes
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
error = EN_deleteproject(&ph);
error = EN_deleteproject(ph);
BOOST_REQUIRE(error == 0);
}
@@ -106,10 +106,10 @@ BOOST_FIXTURE_TEST_CASE(test_adddemand, FixtureSingleNode)
error = EN_adddemand(ph, node_qhut, 1.0, "TertiaryPattern", "TertiaryDemand");
BOOST_CHECK(error == 0);
error = EN_getnumdemands(ph, node_qhut, &nD1);
BOOST_REQUIRE(error == 0);
error = EN_getdemandindex(ph, node_qhut, "TertiaryDemand", &Dindex);
BOOST_CHECK(error == 0);
BOOST_CHECK(Dindex == nD1);

6
tests/test_link.cpp
View File

@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(test_setlinktype)
// Close and delete project
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
@@ -178,7 +178,7 @@ BOOST_AUTO_TEST_CASE(test_link_setid_save)
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_AUTO_TEST_CASE(test_link_setid_reopen, * boost::unit_test::depends_on("test_link/test_link_setid_save"))
@@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE(test_link_setid_reopen, * boost::unit_test::depends_on("tes
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_FIXTURE_TEST_CASE(test_link_comments, FixtureOpenClose)

6
tests/test_net_builder.cpp
View File

@@ -43,7 +43,7 @@ struct FixtureInitClose {
~FixtureInitClose() {
EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
int error;
EN_Project ph;
@@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(test_open_net1, * boost::unit_test::depends_on("test_net_bu
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
//---------------------------------------------------------------------
// if we got this far we can compare results
@@ -408,7 +408,7 @@ BOOST_AUTO_TEST_CASE(test_reopen_net2, *boost::unit_test::depends_on("test_net_b
// Close project
EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_AUTO_TEST_SUITE_END()

6
tests/test_node.cpp
View File

@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(test_setid_save)
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
@@ -239,7 +239,7 @@ BOOST_AUTO_TEST_CASE(test_setid_reopen, * boost::unit_test::depends_on("setid_sa
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_AUTO_TEST_SUITE_END()
@@ -345,7 +345,7 @@ BOOST_AUTO_TEST_CASE(test_reopen_comment, * boost::unit_test::depends_on("node_c
// Close project
EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}

12
tests/test_overflow.cpp
View File

@@ -89,14 +89,14 @@ BOOST_AUTO_TEST_CASE(test_tank_overflow)
BOOST_REQUIRE(spillage > 0.0001);
error = EN_getlinkvalue(ph, Lindex, EN_FLOW, &inflow);
BOOST_REQUIRE(error == 0);
BOOST_REQUIRE(abs(-inflow - spillage) < 0.0001);
BOOST_REQUIRE(abs(-inflow - spillage) < 0.0001);
// Save project to file and then close it
error = EN_saveinpfile(ph, testFile);
BOOST_REQUIRE(error == 0);
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
// Re-open saved file & run it
error = EN_open(ph, testFile, DATA_PATH_RPT, "");
BOOST_REQUIRE(error == 0);
@@ -107,13 +107,13 @@ BOOST_AUTO_TEST_CASE(test_tank_overflow)
error = EN_getnodevalue(ph, Nindex, EN_DEMAND, &spillage2);
BOOST_REQUIRE(error == 0);
BOOST_REQUIRE(abs(spillage - spillage2) < 0.0001);
// Clean up
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
error = EN_deleteproject(&ph);
error = EN_deleteproject(ph);
BOOST_REQUIRE(error == 0);
}
BOOST_AUTO_TEST_SUITE_END()

2
tests/test_pattern.cpp
View File

@@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE(test_add_set)
BOOST_REQUIRE(y == y3[0]);
EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_FIXTURE_TEST_CASE(test_pattern_comments, FixtureOpenClose)

13
tests/test_project.cpp
View File

@@ -31,10 +31,9 @@ BOOST_AUTO_TEST_CASE (test_create_delete)
BOOST_REQUIRE(error == 0);
BOOST_CHECK(ph != NULL);
error = EN_deleteproject(&ph);
error = EN_deleteproject(ph);
BOOST_REQUIRE(error == 0);
BOOST_CHECK(ph == NULL);
}
BOOST_AUTO_TEST_CASE (test_open_close)
@@ -51,7 +50,7 @@ BOOST_AUTO_TEST_CASE (test_open_close)
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_AUTO_TEST_CASE(test_init_close)
@@ -65,7 +64,7 @@ BOOST_AUTO_TEST_CASE(test_init_close)
error = EN_close(ph);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_AUTO_TEST_CASE(test_save)
@@ -85,7 +84,7 @@ BOOST_AUTO_TEST_CASE(test_save)
error = EN_close(ph_save);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph_save);
EN_deleteproject(ph_save);
}
BOOST_AUTO_TEST_CASE(test_reopen, * boost::unit_test::depends_on("test_project/test_save"))
@@ -100,7 +99,7 @@ BOOST_AUTO_TEST_CASE(test_reopen, * boost::unit_test::depends_on("test_project/t
error = EN_close(ph_reopen);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph_reopen);
EN_deleteproject(ph_reopen);
}
BOOST_AUTO_TEST_CASE(test_run)
@@ -114,7 +113,7 @@ BOOST_AUTO_TEST_CASE(test_run)
error = EN_runproject(ph, DATA_PATH_NET1, DATA_PATH_RPT, DATA_PATH_OUT, NULL);
BOOST_REQUIRE(error == 0);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
BOOST_AUTO_TEST_SUITE_END()

2
tests/test_reent.cpp
View File

@@ -42,7 +42,7 @@ void epanet_thread(long i)
EN_createproject(&ph);
errorcode = EN_runproject(ph, input.c_str(), report.c_str(), output.c_str(), NULL);
EN_deleteproject(&ph);
EN_deleteproject(ph);
printf("Thread #%ld EPANET done. Status = %d\n", i, errorcode);
}

8
tests/test_toolkit.hpp
View File

@@ -33,7 +33,7 @@ struct FixtureOpenClose{
~FixtureOpenClose() {
error = EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
int error;
@@ -52,7 +52,7 @@ struct FixtureInitClose {
~FixtureInitClose() {
EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
int error;
EN_Project ph;
@@ -94,7 +94,7 @@ struct FixtureAfterStep{
BOOST_REQUIRE(error == 0);
error = EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
int error, flag;
@@ -115,7 +115,7 @@ struct FixtureSingleNode {
~FixtureSingleNode() {
EN_close(ph);
EN_deleteproject(&ph);
EN_deleteproject(ph);
}
int error, index, node_qhut;
EN_Project ph;