Skip to content

Commit

Permalink
Merge pull request #30 from libAudioFlux/pitch
Browse files Browse the repository at this point in the history
Update vector.
  • Loading branch information
liufeigit authored Nov 24, 2023
2 parents 2b32aaf + 38eed7a commit caa55e0
Show file tree
Hide file tree
Showing 2 changed files with 176 additions and 3 deletions.
168 changes: 166 additions & 2 deletions src/vector/flux_vector.c
Original file line number Diff line number Diff line change
Expand Up @@ -1888,6 +1888,118 @@ void __vsort(float *vArr1,int length,int type,float *vArr2){
}
}

void __vcorrsort(float *arr1,float *arr2,float *arr3,int length,int type){
float value1=0;
float value2=0;
float value3=0;

for(int i=0;i<length;i++){
for(int j=i+1;j<length;j++){
if(!type){ // asc
if(arr1[i]>arr1[j]){
value1=arr1[i];
arr1[i]=arr1[j];
arr1[j]=value1;

if(arr2){
value2=arr2[i];
arr2[i]=arr2[j];
arr2[j]=value2;
}

if(arr3){
value3=arr3[i];
arr3[i]=arr3[j];
arr3[j]=value3;
}
}
}
else{ // desc
if(arr1[i]<arr1[j]){
value1=arr1[i];
arr1[i]=arr1[j];
arr1[j]=value1;

if(arr2){
value2=arr2[i];
arr2[i]=arr2[j];
arr2[j]=value2;
}

if(arr3){
value3=arr3[i];
arr3[i]=arr3[j];
arr3[j]=value3;
}
}
}
}
}
}

void __vcorrsort1(float *arr1,float *arr2,float *arr3,int *arr4,int length,int type){
float value1=0;
float value2=0;
float value3=0;

int value4=0;

for(int i=0;i<length;i++){
for(int j=i+1;j<length;j++){
if(!type){ // asc
if(arr1[i]>arr1[j]){
value1=arr1[i];
arr1[i]=arr1[j];
arr1[j]=value1;

if(arr2){
value2=arr2[i];
arr2[i]=arr2[j];
arr2[j]=value2;
}

if(arr3){
value3=arr3[i];
arr3[i]=arr3[j];
arr3[j]=value3;
}

if(arr4){
value4=arr4[i];
arr4[i]=arr4[j];
arr4[j]=value4;
}
}
}
else{ // desc
if(arr1[i]<arr1[j]){
value1=arr1[i];
arr1[i]=arr1[j];
arr1[j]=value1;

if(arr2){
value2=arr2[i];
arr2[i]=arr2[j];
arr2[j]=value2;
}

if(arr3){
value3=arr3[i];
arr3[i]=arr3[j];
arr3[j]=value3;
}

if(arr4){
value4=arr4[i];
arr4[i]=arr4[j];
arr4[j]=value4;
}
}
}
}
}
}

void __vsorti(int *vArr1,int length,int type,int *vArr2){
int *arr=NULL;

Expand All @@ -1903,14 +2015,14 @@ void __vsorti(int *vArr1,int length,int type,int *vArr2){
for(int j=i+1;j<length;j++){
int _value=0;

if(!type){ //
if(!type){ // asc
if(arr[i]>arr[j]){
_value=arr[i];
arr[i]=arr[j];
arr[j]=_value;
}
}
else{ //
else{ // desc
if(arr[i]<arr[j]){
_value=arr[i];
arr[i]=arr[j];
Expand All @@ -1921,6 +2033,58 @@ void __vsorti(int *vArr1,int length,int type,int *vArr2){
}
}

int __vindex(float *vArr1,int length,float value){
int index=-1;

for(int i=0;i<length;i++){
if(fabsf(vArr1[i]-value)<1e-6){
index=i;
break;
}
}

return index;
}

int __vindexi(int *vArr1,int length,int value){
int index=-1;

for(int i=0;i<length;i++){
if(vArr1[i]==value){
index=i;
break;
}
}

return index;
}

int __vhas(float *vArr1,int length,float value){
int flag=0;

for(int i=0;i<length;i++){
if(fabsf(vArr1[i]-value)<1e-6){
flag=1;
break;
}
}

return flag;
}

int __vhasi(int *vArr1,int length,int value){
int flag=0;

for(int i=0;i<length;i++){
if(vArr1[i]==value){
flag=1;
break;
}
}

return flag;
}

// element math相关
void __vmap(float *vArr1,int length,void *callback,float *vArr2){
float *arr=NULL;
Expand Down
11 changes: 10 additions & 1 deletion src/vector/flux_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,19 @@ float __vzcr(float *vArr1,int length);

void __vunwrap(float *vArr1,int length,float *vArr2);

// type 0 升 1降
// type 0 asc 1 desc
void __vsort(float *vArr1,int length,int type,float *vArr2);
void __vsorti(int *vArr1,int length,int type,int *vArr2);

void __vcorrsort(float *vArr1,float *vArr2,float *vArr3,int length,int type);
void __vcorrsort1(float *vArr1,float *vArr2,float *vArr3,int *vArr4,int length,int type);

int __vindex(float *vArr1,int length,float value);
int __vindexi(int *vArr1,int length,int value);

int __vhas(float *vArr1,int length,float value);
int __vhasi(int *vArr1,int length,int value);

// univers function op
void __vmap(float *vArr1,int length,void *callback,float *vArr2);
void __vmap1(float *vArr1,int length,void *callback1,float value,float *vArr2);
Expand Down

0 comments on commit caa55e0

Please sign in to comment.