Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,10 @@ int daqp_update_M(DAQPWorkspace *work, c_float *A, const int mask){
work->M[disp2-j]=work->Rinv[--disp]*A[disp2-j];
}
for(; j<n; ++j){// Take into account scaling in Rinv
c_float col_scaling = A[disp2-j]/work->scaling[n-j-1];
for(i=0;i<j;++i)
work->M[disp2-i] += (work->Rinv[--disp]/work->scaling[n-j-1])*A[disp2-j];
work->M[disp2-j]=(work->Rinv[--disp]/work->scaling[n-j-1])*A[disp2-j];
work->M[disp2-i] += work->Rinv[--disp]*col_scaling;
work->M[disp2-j]= work->Rinv[--disp]*col_scaling;
}
}
}
Expand Down Expand Up @@ -284,9 +285,10 @@ void daqp_update_v(c_float *f, DAQPWorkspace *work, const int mask){
work->v[j]=work->Rinv[--disp]*f[j];
}
for(;j>=0;j--){// Take into accoutn scaling in Rinv
c_float col_scaling = f[j]/work->scaling[j];
for(i=n-1;i>j;i--)
work->v[i] +=(work->Rinv[--disp]/work->scaling[j])*f[j];
work->v[j]=(work->Rinv[--disp]/work->scaling[j])*f[j];
work->v[i] +=work->Rinv[--disp]*col_scaling;
work->v[j]=work->Rinv[--disp]*col_scaling;
}
}

Expand Down
Loading