Skip to content

Commit

Permalink
Add EN_loadpatternfile, ENloadpatternfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Mariosmsk committed Jul 31, 2024
1 parent 2f4ae4c commit 5335088
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 1 deletion.
4 changes: 3 additions & 1 deletion include/epanet2.h
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ extern "C" {
********************************************************************/

int DLLEXPORT ENaddpattern(const char *id);

int DLLEXPORT ENdeletepattern(int index);

int DLLEXPORT ENgetpatternindex(const char *id, int *index);
Expand All @@ -346,6 +346,8 @@ extern "C" {
int DLLEXPORT ENgetaveragepatternvalue(int index, EN_API_FLOAT_TYPE *value);

int DLLEXPORT ENsetpattern(int index, EN_API_FLOAT_TYPE *values, int len);

int DLLEXPORT ENloadpatternfile(const char *filename, const char *id);

/********************************************************************
Expand Down
9 changes: 9 additions & 0 deletions include/epanet2_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -1478,6 +1478,15 @@ typedef struct Project *EN_Project;
use @ref EN_setpatternvalue to revise pattern factors one at a time.
*/
int DLLEXPORT EN_setpattern(EN_Project ph, int index, double *values, int len);

/**
@brief Loads time patterns from a file into a project under a specific pattern ID.
@param ph an EPANET project handle.
@param filename the name of the file containing pattern data.
@param id the ID name of the new pattern to load.
@return an error code.
*/
int DLLEXPORT EN_loadpatternfile(EN_Project p, const char *filename, const char *id);

/********************************************************************
Expand Down
63 changes: 63 additions & 0 deletions src/epanet.c
Original file line number Diff line number Diff line change
Expand Up @@ -4514,6 +4514,69 @@ int DLLEXPORT EN_addpattern(EN_Project p, const char *id)
return 0;
}

int DLLEXPORT EN_loadpatternfile(EN_Project p, const char *filename, const char *id)
/*----------------------------------------------------------------
** Input: filename = name of the file containing pattern data
** id = ID for the new pattern
** Output: none
** Returns: error code
** Purpose: loads time patterns from a file into a project under a specific pattern ID
**----------------------------------------------------------------
*/
{
FILE *file;
char line[1024];
int err = 0;
int i;
double value;
Spattern *pat;

if (!p->Openflag) return 102;

file = fopen(filename, "r");
if (file == NULL) return 102; // Update with new error code

// Add the new pattern
if ((err = EN_addpattern(p, id)) != 0) {
fclose(file);
return err;
}

// Get the index of the newly added pattern
if ((err = EN_getpatternindex(p, id, &i)) != 0) {
fclose(file);
return err;
}

pat = &p->network.Pattern[i];
// Free the initial allocation
free(pat->F);
pat->F = NULL;
pat->Length = 0;

// Read pattern values
while (fgets(line, sizeof(line), file) != NULL) {
// Skip comments and empty lines
if (line[0] == ';' || line[0] == '\n') continue;

// Convert line to a double value
value = atof(line);
if (value == 0 && line[0] != '0') continue; // Skip invalid lines

pat->Length++;
pat->F = (double *)realloc(pat->F, pat->Length * sizeof(double));
// Abort if memory allocation error
if (pat->F == NULL) {
fclose(file);
return 101;
}
pat->F[pat->Length - 1] = value;
}

fclose(file);
return 0;
}

int DLLEXPORT EN_deletepattern(EN_Project p, int index)
/*----------------------------------------------------------------
** Input: index = index of the pattern to delete
Expand Down
5 changes: 5 additions & 0 deletions src/epanet2.c
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,11 @@ int DLLEXPORT ENsetpattern(int index, EN_API_FLOAT_TYPE *values, int len)
return errcode;
}

int DLLEXPORT ENloadpatternfile(const char *filename, const char *id)
{
return EN_loadpatternfile(_defaultProject, filename, id);
}

/********************************************************************
Data Curve Functions
Expand Down

0 comments on commit 5335088

Please sign in to comment.