Skip to content

Jh refactor 6 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wkearn merged 3 commits into from
Jul 28, 2026
Merged

Jh refactor 6 #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40badca
ptrdiff_t for FormatArrayI()
jkhillier Jul 27, 2026
b1f3f96
refactored wavInterpCombii to have inner function
jkhillier Jul 27, 2026
0133633
Remove leftover variable declarations
jkhillier Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 46 additions & 50 deletions src/swt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,18 @@

/*THE FUNCTION DEFINITIONS*/
int formatarray(float another[]);
int formatarrayI(int another[]);
int formatarrayI(ptrdiff_t another[]);
int getlineJH(char line[], FILE *fdata);
int Interpolate(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], int WavCombLeft[], int WavCombRight[]);
int PostProcess(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], int WavCombLeft[], int WavCombRight[]);
int Interpolate(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], ptrdiff_t WavCombLeft[], ptrdiff_t WavCombRight[]);
int PostProcess(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], ptrdiff_t WavCombLeft[], ptrdiff_t WavCombRight[]);
float quick_select(float arr[], int n);
int ReadData (char *argv[], float distance[], float depth[], float longitude[], float latitude[]);
int tempInterp(float distance[], float depth[], float tempFiltered[],int start,int end);
int wavCompute(float distance[], float depth[], float WavCoeff[], float scale, float wavWeighting[], ptrdiff_t numberlines);
int wavInterpii(float WavCoeff[], ptrdiff_t numberlines, float CoeffThreshold, float distance[], float scale);
int wavInterpComb(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], int WavCombLeft[], int WavCombRight[]);
int wavInterpComb(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], ptrdiff_t WavCombLeft[], ptrdiff_t WavCombRight[]);
int wavInterpCombii(char *argv[], float WavComb[], ptrdiff_t numberlines, float distance[], float WavCombScale[], float ScaleInteract);
int wavInterpCombii_inner(int linenum, float WavComb[], float distance[], float WavCombScale[], ptrdiff_t Arr1[], float Arr2[], float Arr3[] );
int wavelet(float distance[], float depth[], char *argv[], ptrdiff_t numberlines);


Expand Down Expand Up @@ -73,12 +74,13 @@ int formatarray(float another[])
return 0;
}


/*FORMATARRAYI*/
/*formatarrayI: formats an array ready to be read into*/
int formatarrayI(int another[])
int formatarrayI(ptrdiff_t another[])

{
int i;
ptrdiff_t i;
/*'<' is there as arrays start at [0]*/
for (i = 0; i < MAXCOLUMNS; i++)
another[i] = 0;
Expand Down Expand Up @@ -111,7 +113,7 @@ int getlineJH(char s[], FILE *fdata)
/*INTERPOLATE*/
/*Interpolate: Takes the limits of the objects e.g. from WavCombLeft[]
and creates a filtered value.*/
int Interpolate(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], int WavCombLeft[], int WavCombRight[])
int Interpolate(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], ptrdiff_t WavCombLeft[], ptrdiff_t WavCombRight[])

{
int e,f,g; /*loop variable*/
Expand Down Expand Up @@ -154,7 +156,7 @@ int Interpolate(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float d

/*POSTPROCESS*/
/*PostProcess: Second generation of post processing routine*/
int PostProcess(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], int WavCombLeft[], int WavCombRight[])
int PostProcess(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], ptrdiff_t WavCombLeft[], ptrdiff_t WavCombRight[])

{
int b,c,d,e,f,h,i,j,k,l,m; /*loop variables*/
Expand All @@ -174,7 +176,7 @@ int PostProcess(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float d
int ObjectsCount; /*How many object are there still to do*/
int criteriaFulfilled;
float widthFract, MoveMax, Move;
int summitlocation[MAXCOLUMNS]; /*Array containing the summit locations of the features
ptrdiff_t summitlocation[MAXCOLUMNS]; /*Array containing the summit locations of the features
as this is not necessarily where the max coeff is located*/
float GradCentre, GradCleft, GradCright; /*variables for computation of the slope-based restriction*/
float height, heightmax, depthInterp;
Expand Down Expand Up @@ -536,8 +538,8 @@ int PostProcess(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float d
InsidePosnRHS--;
}
RHSgradient = (depth[InsidePosnRHS]-depth[(WavCombRight[f] + moveR)])/(distance[(WavCombRight[f] + moveR)]-distance[InsidePosnRHS]);
printf("Summit location: %d\n", summitlocation[f]);
printf("WavCombRight[%d] %d InsidePosnRHS: %d RHSgradient %f \n",f,WavCombRight[f]+moveR,InsidePosnRHS, RHSgradient);
printf("Summit location: %td\n", summitlocation[f]);
printf("WavCombRight[%d] %td InsidePosnRHS: %d RHSgradient %f \n",f,WavCombRight[f]+moveR,InsidePosnRHS, RHSgradient);

/*Make sure that the object hasn't expanded too much*/
TooBig = 0;
Expand Down Expand Up @@ -907,8 +909,8 @@ int wavelet(float distance[], float depth[], char *argv[], ptrdiff_t numberlines
float WavFilt[MAXCOLUMNS]; /*The array to hold the output filtered points*/
float WavComb[MAXCOLUMNS]; /*Holds the max approved coeffs from across the scales*/
float WavCombScale[MAXCOLUMNS]; /*Holds the scale at which the coeffs above come from*/
int WavCombLeft[MAXCOLUMNS]; /*Holds the array element of the left hand side extremity of each feature*/
int WavCombRight[MAXCOLUMNS]; /*Holds the array element of the right hand side extremity of each feature*/
ptrdiff_t WavCombLeft[MAXCOLUMNS]; /*Holds the array element of the left hand side extremity of each feature*/
ptrdiff_t WavCombRight[MAXCOLUMNS]; /*Holds the array element of the right hand side extremity of each feature*/

float WavCoeff[MAXCOLUMNS]; /*Coeffs of wavelet transform at a given scale*/
float WavWeighting[MAXCOLUMNS]; /*holds the weighting for the wavCompute
Expand Down Expand Up @@ -1282,7 +1284,7 @@ for (j = 0; j < numberlines; j++)
/*wavInterpComb: Finds the limits of the objects, and creates a filtered value.
My initial go at this will just be to find the non-zero patches of
WavComb*/
int wavInterpComb(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], int WavCombLeft[], int WavCombRight[])
int wavInterpComb(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float depth[], float distance[], float WavCombScale[], ptrdiff_t WavCombLeft[], ptrdiff_t WavCombRight[])

{
int a,b,c,d,e,f,g,k,h,i,j; /*loop variable*/
Expand Down Expand Up @@ -1440,33 +1442,17 @@ int wavInterpComb(float WavComb[], ptrdiff_t numberlines, float WavFilt[], float
int wavInterpCombii(char *argv[], float WavComb[], ptrdiff_t numberlines, float distance[], float WavCombScale[], float ScaleInteract)

{
int a,b,c,d,e; /*loop variables*/
int len;
int linenum;
char line[MAXLINE];
float column1, column2, column3;
FILE *fdata; /*Interpreted Coefficients file - objects as selected max coeff, all scales sequentially*/
int Arr1[MAXCOLUMNS]; /*arrays to read the file into - local*/
ptrdiff_t Arr1[MAXCOLUMNS]; /*arrays to read the file into - local*/
float Arr2[MAXCOLUMNS];
float Arr3[MAXCOLUMNS];
float distdiff; /*distance between 2 coefficients*/
int Rlogic; /*whether or not the scales interract*/
/*difference in the scales between 2 coefficients now in as ScaleInteract*/
float PairFlatnessFactor;
FILE *fouttemp;
FILE *fouttempB;
float FlatnessFactor; /*factor to determine what is too flat*/
float FlatnessCoeffFactor; /*factor within which wavelet coeffs must be for pointiness to come into play*/
float wide, narrow;

/*As well as ScaleInteract, take out large features if excessively flat*/
FlatnessFactor = 3.0; /*smaller object has to be more than this many times pointier*/
FlatnessCoeffFactor = 4.0; /*if the smaller one has a coefficient within this multiple, it can take it out */

/*Open the file for reading*/
fdata = fopen (argv [3], "r");
fouttemp = fopen ("look.temp", "w");
fouttempB = fopen ("lookB.temp", "w");

formatarrayI(Arr1);
formatarray(Arr2);
Expand All @@ -1486,6 +1472,34 @@ int wavInterpCombii(char *argv[], float WavComb[], ptrdiff_t numberlines, float

fclose (fdata);

/*Add inner function here*/

wavInterpCombii_inner(linenum, WavComb, distance, WavCombScale, Arr1, Arr2, Arr3);

return 0;
}


/*WAV_INTERP_COMINE II - inner function*/
int wavInterpCombii_inner(int linenum, float WavComb[], float distance[], float WavCombScale[], ptrdiff_t Arr1[], float Arr2[], float Arr3[])

{
int Rlogic; /*whether or not the scales interract*/
ptrdiff_t a,b,c,e; /*loop variables*/
float FlatnessFactor; /*factor to determine what is too flat*/
float FlatnessCoeffFactor; /*factor within which wavelet coeffs must be for pointiness to come into play*/
float distdiff; /*distance between 2 coefficients*/
/*difference in the scales between 2 coefficients now in as ScaleInteract*/
float PairFlatnessFactor;
float wide, narrow;


/*As well as ScaleInteract, take out large features if excessively flat*/
FlatnessFactor = 3.0; /*smaller object has to be more than this many times pointier*/
FlatnessCoeffFactor = 4.0; /*if the smaller one has a coefficient within this multiple, it can take it out */



/*Now go through the arrays and sort out which points should be eliminated*/
/*Go in reverse order through the array so that i'm taking the largest scale first*/
for (a = linenum -1; a >= 0; a--)
Expand Down Expand Up @@ -1551,19 +1565,6 @@ int wavInterpCombii(char *argv[], float WavComb[], ptrdiff_t numberlines, float
}
}

/*See what this has done*/
for (d = 0; d < linenum; d++)
{
if (Arr3[d] > 0)
{
fprintf(fouttemp, "%f %f %f \n",distance[Arr1[d]],Arr2[d],Arr3[d]);
}
}





/*Write the remaining data into WavComb[] and WavCombScale[]*/
for (e = 0; e < linenum; e++)
{
Expand All @@ -1574,14 +1575,9 @@ int wavInterpCombii(char *argv[], float WavComb[], ptrdiff_t numberlines, float
}
}


fclose (fouttemp);
fclose (fouttempB);

return 0;
}


}



Expand Down