MMS-2024-25/MMS-Loesung-2024-25
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor finding local extrema for performance

Browse Source
This commit is contained in:
Frederik Beimgraben 2025-01-17 20:08:38 +01:00
parent 4ac8f2d4be
commit 21962c9131
4 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -56,4 +56,6 @@ main
*results.txt *results.txt
tests tests
*.numbered.*
*.old.*

56
MMS24-25.c
View File

@ -748,19 +748,13 @@ double calculateMedian(double *pdIn, int iLen) {
/* /*
* Creates a new LocalExtrema struct * Creates a new LocalExtrema struct
*/ */
LocalExtrema *initLocalExtrema(int *piInPos, int iLen) { LocalExtrema *createLocalExtrema() {
LocalExtrema *localExtrema = (LocalExtrema*) malloc(sizeof(LocalExtrema)); LocalExtrema *localExtrema = (LocalExtrema*) malloc(sizeof(LocalExtrema));
if (localExtrema == NULL) if (localExtrema == NULL)
_mem_error("initLocalExtrema: Failed to allocate memory for localExtrema"); _mem_error("initLocalExtrema: Failed to allocate memory for localExtrema");
localExtrema->iNumLocalExtrema = iLen; localExtrema->iNumLocalExtrema = 0;
localExtrema->piLocalExtremaPos = (int*) malloc(sizeof(int) *iLen); localExtrema->piLocalExtremaPos = NULL;
if (localExtrema->piLocalExtremaPos == NULL)
_mem_error("initLocalExtrema: Failed to allocate memory for localExtrema->piLocalExtremaPos");
for (int i = 0; i < iLen; i++) {
localExtrema->piLocalExtremaPos[i] = piInPos[i];
}
return localExtrema; return localExtrema;
} }
@ -793,56 +787,60 @@ void findLocalExtremaFromArray(
LocalExtrema **ppexLocalMax, LocalExtrema **ppexLocalMax,
LocalExtrema **ppexLocalMin LocalExtrema **ppexLocalMin
) { ) {
int iNumLocalMax = 0;
int iNumLocalMin = 0; LocalExtrema *pexLocalMax = createLocalExtrema();
int *piLocalMaxPos = NULL; LocalExtrema *pexLocalMin = createLocalExtrema();
int *piLocalMinPos = NULL;
int **ppiLocalMaxPos = &pexLocalMax->piLocalExtremaPos;
int **ppiLocalMinPos = &pexLocalMin->piLocalExtremaPos;
int *iNumLocalMax = &pexLocalMax->iNumLocalExtrema;
int *iNumLocalMin = &pexLocalMin->iNumLocalExtrema;
for (int i = 1; i < iLen - 1; i++) { for (int i = 1; i < iLen - 1; i++) {
if (pdIn[i] > pdIn[i-1] && pdIn[i] > pdIn[i+1]) { if (pdIn[i] > pdIn[i-1] && pdIn[i] > pdIn[i+1]) {
iNumLocalMax++; (*iNumLocalMax)++;
#ifdef _DEBUG #ifdef _DEBUG
_debug("findLocalExtremaFromArray: Found local maximum at (%d, %lf)", i, pdIn[i]); _debug("findLocalExtremaFromArray: Found local maximum at (%d, %lf)", i, pdIn[i]);
#endif #endif
if (piLocalMaxPos == NULL) if (*ppiLocalMaxPos == NULL)
piLocalMaxPos = (int*) malloc(sizeof(int) *iNumLocalMax); *ppiLocalMaxPos = (int*) malloc(sizeof(int) * (*iNumLocalMax));
else else
piLocalMaxPos = (int*) realloc(piLocalMaxPos, sizeof(int) *iNumLocalMax); *ppiLocalMaxPos = (int*) realloc(*ppiLocalMaxPos, sizeof(int) * (*iNumLocalMax));
if (piLocalMaxPos == NULL) if (*ppiLocalMaxPos == NULL)
_mem_error("findLocalExtremaFromArray: Failed to allocate memory for piLocalMaxPos"); _mem_error("findLocalExtremaFromArray: Failed to allocate memory for piLocalMaxPos");
piLocalMaxPos[iNumLocalMax-1] = i; *ppiLocalMaxPos[(*iNumLocalMax)-1] = i;
} }
if (pdIn[i] < pdIn[i-1] && pdIn[i] < pdIn[i+1]) { if (pdIn[i] < pdIn[i-1] && pdIn[i] < pdIn[i+1]) {
iNumLocalMin++; (*iNumLocalMin)++;
#ifdef _DEBUG #ifdef _DEBUG
_debug("findLocalExtremaFromArray: Found local minimum at (%d, %lf)", i, pdIn[i]); _debug("findLocalExtremaFromArray: Found local minimum at (%d, %lf)", i, pdIn[i]);
#endif #endif
if (piLocalMinPos == NULL) if (*ppiLocalMinPos == NULL)
piLocalMinPos = (int*) malloc(sizeof(int) *iNumLocalMin); *ppiLocalMinPos = (int*) malloc(sizeof(int) * (*iNumLocalMin));
else else
piLocalMinPos = (int*) realloc(piLocalMinPos, sizeof(int) *iNumLocalMin); *ppiLocalMinPos = (int*) realloc(*ppiLocalMinPos, sizeof(int) * (*iNumLocalMin));
if (piLocalMinPos == NULL) if (*ppiLocalMinPos == NULL)
_mem_error("findLocalExtremaFromArray: Failed to allocate memory for piLocalMinPos"); _mem_error("findLocalExtremaFromArray: Failed to allocate memory for piLocalMinPos");
piLocalMinPos[iNumLocalMin-1] = i; *ppiLocalMinPos[(*iNumLocalMin)-1] = i;
} }
} }
#ifdef _DEBUG #ifdef _DEBUG
_debug("findLocalExtremaFromArray: Found %d local maxima", iNumLocalMax); _debug("findLocalExtremaFromArray: Found %d local maxima", *iNumLocalMax);
_debug("findLocalExtremaFromArray: Found %d local minima", iNumLocalMin); _debug("findLocalExtremaFromArray: Found %d local minima", *iNumLocalMin);
#endif #endif
*ppexLocalMax = initLocalExtrema(piLocalMaxPos, iNumLocalMax); *ppexLocalMax = pexLocalMax;
*ppexLocalMin = initLocalExtrema(piLocalMinPos, iNumLocalMin); *ppexLocalMin = pexLocalMin;
} }
/* /*

2
Makefile
View File

@ -1,6 +1,6 @@
CC=gcc CC=gcc
SOURCE_FILE=MMS24-25.c SOURCE_FILE=MMS24-25.c
OPTS=-lm OPTS=-lm -D _DEBUG
all: clean tests run all: clean tests run

6
tests.c
View File

@ -469,6 +469,12 @@ void testCalcExtrema() {
Extrema *extrema = initExtrema(pdValues, 10); Extrema *extrema = initExtrema(pdValues, 10);
info("*extrema: %p", extrema);
info("*extrema->pexLocalMax: %p", extrema->pexLocalMax);
info("*extrema->pexLocalMin: %p", extrema->pexLocalMin);
info("*extrema->pexLocalMax->piLocalExtremaPos: %p", extrema->pexLocalMax->piLocalExtremaPos);
info("*extrema->pexLocalMin->piLocalExtremaPos: %p", extrema->pexLocalMin->piLocalExtremaPos);
if (extrema->pexLocalMax->iNumLocalExtrema != 1) { if (extrema->pexLocalMax->iNumLocalExtrema != 1) {
error("Failed to calculate the correct number of local maxima: %d != 1", extrema->pexLocalMax->iNumLocalExtrema); error("Failed to calculate the correct number of local maxima: %d != 1", extrema->pexLocalMax->iNumLocalExtrema);
} }