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

Cleaning up gcc build

Browse Source
This commit is contained in:
Michael Tryby
2019-04-19 21:51:55 -04:00
parent 405822cdf6
commit e2e12fab22
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/demand.c
View File

@@ -33,7 +33,7 @@ typedef struct demand_data_s
list_t *create_demand_list(double base_demand, int pattern_index, char *category_name) list_t *create_demand_list(double base_demand, int pattern_index, const char *category_name)
{ {
list_t *demand_list; list_t *demand_list;
demand_data_t *demand_data; demand_data_t *demand_data;
@@ -50,7 +50,7 @@ list_t *create_demand_list(double base_demand, int pattern_index, char *category
} }
demand_data_t *create_demand_data(double base_demand, int pattern_index, char *category_name) demand_data_t *create_demand_data(double base_demand, int pattern_index, const char *category_name)
{ {
demand_data_t *demand_data = (demand_data_t *)malloc(sizeof(demand_data_t)); demand_data_t *demand_data = (demand_data_t *)malloc(sizeof(demand_data_t));
@@ -122,7 +122,7 @@ char *get_category_name(list_node_t *lnode)
return strdup(get_demand_data(lnode)->category_name); return strdup(get_demand_data(lnode)->category_name);
} }
void set_category_name(list_node_t *lnode, char *category_name) void set_category_name(list_node_t *lnode, const char *category_name)
{ {
free(get_demand_data(lnode)->category_name); free(get_demand_data(lnode)->category_name);
get_demand_data(lnode)->category_name = strdup(category_name); get_demand_data(lnode)->category_name = strdup(category_name);

6
src/demand.h
View File

@@ -29,10 +29,10 @@ typedef struct demand_data_s demand_data_t;
// demand list gets declared in types.h struct Snode // demand list gets declared in types.h struct Snode
list_t *create_demand_list(double base_demand, int pattern_index, char *category_name); list_t *create_demand_list(double base_demand, int pattern_index, const char *category_name);
demand_data_t *create_demand_data(double base_demand, int pat_index, char *cat_name); demand_data_t *create_demand_data(double base_demand, int pat_index, const char *cat_name);
void delete_demand_data(void *data); void delete_demand_data(void *data);
@@ -49,7 +49,7 @@ int get_pattern_index(list_node_t *lnode);
void set_pattern_index(list_node_t *lnode, int pattern_index); void set_pattern_index(list_node_t *lnode, int pattern_index);
char *get_category_name(list_node_t *lnode); char *get_category_name(list_node_t *lnode);
void set_category_name(list_node_t *lnode, char *category_name); void set_category_name(list_node_t *lnode, const char *category_name);
// Make this private? // Make this private?
demand_data_t *get_demand_data(list_node_t *lnode); demand_data_t *get_demand_data(list_node_t *lnode);

9
src/inpfile.c
View File

@@ -332,15 +332,14 @@ int saveinpfile(Project *pr, const char *fname)
fprintf(f, s_DEMANDS); fprintf(f, s_DEMANDS);
ucf = pr->Ucf[DEMAND]; ucf = pr->Ucf[DEMAND];
list_t *dlist = NULL; //list_t *dlist = NULL;
list_node_t *lnode = NULL; list_node_t *lnode = NULL;
char *temp = NULL; char *temp = NULL;
for (i = 1; i <= net->Njuncs; i++) for (i = 1; i <= net->Njuncs; i++) {
{
node = &net->Node[i]; node = &net->Node[i];
if (dlist = node->D) { if (node->D) {
for (lnode = first_list(dlist); done_list(lnode); lnode = next_list(lnode)) { for (lnode = first_list(node->D); done_list(lnode); lnode = next_list(lnode)) {
sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode)); sprintf(s, " %-31s %14.6f", node->ID, ucf * get_base_demand(lnode));
if if

2
tests/test_demand_data.cpp
View File

@@ -253,7 +253,7 @@ BOOST_FIXTURE_TEST_CASE(test_pattern_edits, FixtureSingleNode)
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_addpattern(ph, (char *)"Pat2"); error = EN_addpattern(ph, (char *)"Pat2");
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_getpatternindex(ph, "Pat2", &pat2_idx); error = EN_getpatternindex(ph, (char *)"Pat2", &pat2_idx);
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_addpattern(ph, (char *)"Pat3"); error = EN_addpattern(ph, (char *)"Pat3");