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

change names of new functions to ENgetnodevalues and ENgetlinkvalues

Browse Source
This commit is contained in:
Abel Heinsbroek
2024-04-24 15:20:59 +02:00
parent 4dff3bd054
commit 9637f5c092
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/epanet2.h
View File

@@ -293,7 +293,7 @@ extern "C" {
int DLLEXPORT ENgetlinkvalue(int index, int property, EN_API_FLOAT_TYPE *value); int DLLEXPORT ENgetlinkvalue(int index, int property, EN_API_FLOAT_TYPE *value);
int DLLEXPORT ENgetlinksvalues(int property, EN_API_FLOAT_TYPE *value); int DLLEXPORT ENgetlinkvalues(int property, EN_API_FLOAT_TYPE *value);
int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value); int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value);

4
include/epanet2_2.h
View File

@@ -882,7 +882,7 @@ typedef struct Project *EN_Project;
(see @ref Units). (see @ref Units).
*/ */
int DLLEXPORT EN_getnodesvalues(EN_Project ph, int property, double *out_values); int DLLEXPORT EN_getnodevalues(EN_Project ph, int property, double *out_values);
/** /**
@brief Retrieves an array of property values for all nodes. @brief Retrieves an array of property values for all nodes.
@@ -1265,7 +1265,7 @@ typedef struct Project *EN_Project;
Values are returned in units that depend on the units used for flow rate (see @ref Units). Values are returned in units that depend on the units used for flow rate (see @ref Units).
*/ */
int DLLEXPORT EN_getlinksvalues(EN_Project ph, int property, double *out_values); int DLLEXPORT EN_getlinkvalues(EN_Project ph, int property, double *out_values);
/** /**
@brief Sets a property value for a link. @brief Sets a property value for a link.

4
src/epanet.c
View File

@@ -2358,7 +2358,7 @@ int DLLEXPORT EN_getnodevalue(EN_Project p, int index, int property, double *val
return 0; return 0;
} }
int DLLEXPORT EN_getnodesvalues(EN_Project p, int property, double *values) int DLLEXPORT EN_getnodevalues(EN_Project p, int property, double *values)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
** Input: property = node property code (see EN_NodeProperty) ** Input: property = node property code (see EN_NodeProperty)
** Output: values = array of node property values ** Output: values = array of node property values
@@ -3923,7 +3923,7 @@ int DLLEXPORT EN_getlinkvalue(EN_Project p, int index, int property, double *val
return 0; return 0;
} }
int DLLEXPORT EN_getlinksvalues(EN_Project p, int property, double *values) int DLLEXPORT EN_getlinkvalues(EN_Project p, int property, double *values)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
** Input: property = link property code (see EN_LinkProperty) ** Input: property = link property code (see EN_LinkProperty)
** Output: values = array of link property values ** Output: values = array of link property values

8
src/epanet2.c
View File

@@ -355,9 +355,9 @@ int DLLEXPORT ENgetnodevalue(int index, int property, EN_API_FLOAT_TYPE *value)
return errcode; return errcode;
} }
int DLLEXPORT ENgetnodesvalues(int property, EN_API_FLOAT_TYPE *values) int DLLEXPORT ENgetnodevalues(int property, EN_API_FLOAT_TYPE *values)
{ {
return EN_getnodesvalues(_defaultProject, property, values); return EN_getnodevalues(_defaultProject, property, values);
} }
int DLLEXPORT ENsetnodevalue(int index, int property, EN_API_FLOAT_TYPE value) int DLLEXPORT ENsetnodevalue(int index, int property, EN_API_FLOAT_TYPE value)
@@ -528,9 +528,9 @@ int DLLEXPORT ENgetlinkvalue(int index, int property, EN_API_FLOAT_TYPE *value)
*value = (EN_API_FLOAT_TYPE)v; *value = (EN_API_FLOAT_TYPE)v;
return errcode; return errcode;
} }
int DLLEXPORT ENgetlinksvalues(int property, EN_API_FLOAT_TYPE *values) int DLLEXPORT ENgetlinkvalues(int property, EN_API_FLOAT_TYPE *values)
{ {
return EN_getlinksvalues(_defaultProject, property, values); return EN_getlinkvalues(_defaultProject, property, values);
} }
int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value) int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value)