|
 |
0b14f2d |
--- OS-2.10.2/OS/src/OSCommonInterfaces/OSMatrix.cpp.orig 2019-04-10 16:12:13.198645429 -0600
|
|
|
0b14f2d |
+++ OS-2.10.2/OS/src/OSCommonInterfaces/OSMatrix.cpp 2019-06-24 14:21:05.271203523 -0600
|
|
 |
b487a61 |
@@ -1073,7 +1073,7 @@ GeneralSparseMatrix* MatrixType::getMatr
|
|
|
b487a61 |
base_c0 = ((BaseMatrix*)m_mChildren[0])->baseMatrixStartCol;
|
|
|
b487a61 |
base_r0 = ((BaseMatrix*)m_mChildren[0])->baseMatrixStartRow;
|
|
|
b487a61 |
base_cN = ((BaseMatrix*)m_mChildren[0])->baseMatrixEndCol;
|
|
|
b487a61 |
- base_cN = ((BaseMatrix*)m_mChildren[0])->baseMatrixEndRow;
|
|
|
b487a61 |
+ base_rN = ((BaseMatrix*)m_mChildren[0])->baseMatrixEndRow;
|
|
|
b487a61 |
if (base_cN < 0)
|
|
|
b487a61 |
base_cN = baseMtxPtr->numberOfColumns - 1;
|
|
|
b487a61 |
if (base_rN < 0)
|
|
|
0b14f2d |
--- OS-2.10.2/OS/src/OSSolverInterfaces/OSCsdpSolver.cpp.orig 2017-12-08 06:52:50.000000000 -0700
|
|
|
0b14f2d |
+++ OS-2.10.2/OS/src/OSSolverInterfaces/OSCsdpSolver.cpp 2019-06-24 14:22:41.242506951 -0600
|
|
|
b487a61 |
@@ -96,7 +96,7 @@ void CsdpSolver::buildSolverInstance() t
|
|
|
b487a61 |
int* blockSize = NULL;
|
|
|
b487a61 |
int* mtxRef = NULL;
|
|
|
b487a61 |
bool* isdiag = NULL;
|
|
|
b487a61 |
- ExpandedMatrixBlocks** mtxBlocks;
|
|
|
b487a61 |
+ ExpandedMatrixBlocks** mtxBlocks = NULL;
|
|
|
b487a61 |
try
|
|
|
b487a61 |
{
|
|
|
b487a61 |
if(osil.length() == 0 && osinstance == NULL) throw ErrorClass("there is no instance");
|
|
|
b487a61 |
@@ -499,6 +499,7 @@ void CsdpSolver::buildSolverInstance() t
|
|
|
b487a61 |
if (blockSize != NULL) delete [] blockSize;
|
|
|
b487a61 |
if (mtxRef != NULL) delete [] mtxRef;
|
|
|
b487a61 |
if (isdiag != NULL) delete [] isdiag;
|
|
|
b487a61 |
+ if (mtxBlocks != NULL)
|
|
|
b487a61 |
{
|
|
|
b487a61 |
for (int i=0; i <= ncon; i++)
|
|
|
b487a61 |
{
|
|
|
0b14f2d |
--- OS-2.10.2/OS/src/OSUtils/OSdtoa.cpp.orig 2017-12-08 06:52:50.000000000 -0700
|
|
|
0b14f2d |
+++ OS-2.10.2/OS/src/OSUtils/OSdtoa.cpp 2019-06-24 14:18:59.092434099 -0600
|
|
|
b487a61 |
@@ -3979,6 +3979,7 @@ os_dtoa
|
|
|
b487a61 |
k0 = k;
|
|
|
b487a61 |
ilim0 = ilim;
|
|
|
b487a61 |
ieps = 2; /* conservative */
|
|
|
b487a61 |
+ j1 = 0;
|
|
|
b487a61 |
if (k > 0) {
|
|
|
b487a61 |
ds = tens[k&0xf];
|
|
|
b487a61 |
j = k >> 4;
|