Skip to content

refactor: use logical operators instead of bitwise in conditionals #41

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

Open
m-muecke wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: use logical operators instead of bitwise in conditionals #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion C/IN_AutoMutualInfoStats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ double IN_AutoMutualInfoStats_40_gaussian_fmmi(const double y[], const int size)
// find first minimum of automutual information
double fmmi = tau;
for(int i = 1; i < tau-1; i++){
if(ami[i] < ami[i-1] & ami[i] < ami[i+1]){
if(ami[i] < ami[i-1] && ami[i] < ami[i+1]){
fmmi = i;
// printf("found minimum at %i\n", i);
break;
Expand Down
4 changes: 2 additions & 2 deletions C/PD_PeriodicityWang.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ int PD_PeriodicityWang_th0_01(const double * y, const int size){
slopeIn = acf[i] - acf[i-1];
slopeOut = acf[i+1] - acf[i];

if(slopeIn < 0 & slopeOut > 0)
if(slopeIn < 0 && slopeOut > 0)
{
// printf("trough at %i\n", i);
troughs[nTroughs] = i;
nTroughs += 1;
}
else if(slopeIn > 0 & slopeOut < 0)
else if(slopeIn > 0 && slopeOut < 0)
{
// printf("peak at %i\n", i);
peaks[nPeaks] = i;
Expand Down
4 changes: 2 additions & 2 deletions C/SB_BinaryStats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ double SB_BinaryStats_diff_longstretch0(const double y[], const int size){
int maxstretch0 = 0;
int last1 = 0;
for(int i = 0; i < size-1; i++){
if(yBin[i] == 1 | i == size-2){
if(yBin[i] == 1 || i == size-2){
double stretch0 = i - last1;
if(stretch0 > maxstretch0){
maxstretch0 = stretch0;
Expand Down Expand Up @@ -75,7 +75,7 @@ double SB_BinaryStats_mean_longstretch1(const double y[], const int size){
int maxstretch1 = 0;
int last1 = 0;
for(int i = 0; i < size-1; i++){
if(yBin[i] == 0 | i == size-2){
if(yBin[i] == 0 || i == size-2){
double stretch1 = i - last1;
if(stretch1 > maxstretch1){
maxstretch1 = stretch1;
Expand Down
4 changes: 2 additions & 2 deletions C/SP_Summaries.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int welch(const double y[], const int size, const int NFFT, const double Fs, con
*Pxx = malloc(Nout * sizeof(double));
for(int i = 0; i < Nout; i++){
(*Pxx)[i] = P[i]/KMU*dt;
if(i>0 & i < Nout-1){
if(i>0 && i < Nout-1){
(*Pxx)[i] *= 2;
}
}
Expand Down Expand Up @@ -148,7 +148,7 @@ double SP_Summaries_welch_rect(const double y[], const int size, const char what
w[i] = 2*PI*f[i];
Sw[i] = S[i]/(2*PI);
//printf("w[%i]=%1.3f, Sw[%i]=%1.3f\n", i, w[i], i, Sw[i]);
if(isinf(Sw[i]) | isinf(-Sw[i])){
if(isinf(Sw[i]) || isinf(-Sw[i])){
return 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion C/splinefit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ int splinefit(const double *y, const int size, double *yOut)

int breakInd = 1;
for(int i = 0; i < size; i++){
if(i >= breaks[breakInd] & breakInd<nBreaks-1)
if(i >= breaks[breakInd] && breakInd<nBreaks-1)
breakInd += 1;
for(int j = 0; j < nSpline; j++){
xsB[i*nSpline+j] = i - breaks[breakInd-1];
Expand Down