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

Merge pull request #296 from eladsal/dev-dem-cat

Browse Source 
Add demand names get\set APIs
Close #294
This commit is contained in:
Elad Salomons
2018-10-01 10:47:40 +03:00
committed by GitHub
parent 75ad505601 0932ef7d80
commit 4848f692f6
6 changed files with 162 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/epanet.c
View File

@@ -530,6 +530,15 @@ int DLLEXPORT ENgetaveragepatternvalue(int index, EN_API_FLOAT_TYPE *value) {
return EN_getaveragepatternvalue(_defaultModel, index, value);
}
int DLLEXPORT ENgetdemandname(int nodeIndex, int demandIdx,
char *demandName) {
return EN_getdemandname(_defaultModel, nodeIndex, demandIdx, demandName);
}
int DLLEXPORT ENsetdemandname(int nodeIndex, int demandIdx,
char *demandName) {
return EN_setdemandname(_defaultModel, nodeIndex, demandIdx, demandName);
}
int DLLEXPORT ENgetrule(int index, int *nPremises, int *nTrueActions,
int *nFalseActions, EN_API_FLOAT_TYPE *priority) {
@@ -4765,6 +4774,55 @@ int DLLEXPORT EN_setbasedemand(EN_ProjectHandle ph, int nodeIndex, int demandIdx
return set_error(pr->error_handle, 0);
}
int DLLEXPORT EN_getdemandname(EN_ProjectHandle ph, int nodeIndex, int demandIdx, char *demandName) {
Pdemand d;
int n = 1;
EN_Project *p = (EN_Project*)ph;
strcpy(demandName, "");
/* Check for valid arguments */
if (!p->Openflag)
return set_error(p->error_handle, 102);
if (nodeIndex <= 0 || nodeIndex > p->network.Njuncs)
return set_error(p->error_handle, 203);
for (d = p->network.Node[nodeIndex].D; n < demandIdx && d->next != NULL; d = d->next) {
n++;
}
if (n != demandIdx) {
return set_error(p->error_handle, 253);
}
strcpy(demandName, d->Name);
return set_error(p->error_handle, 0);
}
int DLLEXPORT EN_setdemandname(EN_ProjectHandle ph, int nodeIndex, int demandIdx, char *demandName) {
EN_Project *pr = (EN_Project*)ph;
EN_Network *net = &pr->network;
Snode *Node = net->Node;
const int Nnodes = net->Nnodes;
const int Njuncs = net->Njuncs;
double *Ucf = pr->Ucf;
Pdemand d;
int n = 1;
/* Check for valid arguments */
if (!pr->Openflag)
return set_error(pr->error_handle, 102);
if (nodeIndex <= 0 || nodeIndex > Njuncs)
return set_error(pr->error_handle, 203);
for (d = Node[nodeIndex].D; n < demandIdx && d->next != NULL; d = d->next)
n++;
if (n != demandIdx)
return set_error(pr->error_handle, 253);
strncpy(d->Name, demandName, MAXMSG);
return set_error(pr->error_handle, 0);
}
int DLLEXPORT EN_setdemandpattern(EN_ProjectHandle ph, int nodeIndex, int demandIdx, int patIndex) {
EN_Project *pr = (EN_Project*)ph;