WebSVN – gelsvn – Diff – /trunk/src/LinAlg/LapackFunc.cpp

+/* ----------------------------------------------------------------------- *
+ * This file is part of GEL, http://www.imm.dtu.dk/GEL
+ * Copyright (C) the authors and DTU Informatics
+ * For license and list of authors, see ../../doc/intro.pdf
+ * ----------------------------------------------------------------------- */
 #include <iostream>
 #include <vector>
 #include "LapackFunc.h"
 extern "C" {
 	V.Resize(nCols,nCols);
 	dgesvd_ (&jobu, &jobvt, &nRows, &nCols, a[0], &lda, &(s[0]), U[0], &ldu, V[0], &ldvt,work, &lwork, &info);
-	assert(info==0);
+	assert(info>=0);
-	delete work;
+	delete [] work;
 	U.Transpose();
+}
 void SVD(const CMatrix& A,
 		 CMatrix& U,
 	char jobvt='N';
 	int ldvt=1;
 	dgesvd_ (&jobu, &jobvt, &nRows, &nCols, a[0], &lda, &(s[0]), NULL, &ldu, NULL, &ldvt,work, &lwork, &info);
-	assert(info==0);
+	assert(info>=0);
-	delete work;
+	delete [] work;
 	return s;
+}
 	double *work = new double[lwork];
 	std::vector<int> ipiv(A.Rows());
 	dsysv_(&uplo, &nRows, &nrhs, a[0], &nRows, &ipiv[0], &(x[0]), &nRows,
 				 work, &lwork, &info);
-	delete work;
+	delete [] work;
 	assert(info==0);
+}
 CVector LinearSolveSPD(const CMatrix& A,const CVector&b)
 	memcpy(&(x[0]),BX,nCols*sizeof(double));
 	assert(info==0);
+    delete [] BX;
-	delete s;
+	delete [] s;
-	delete work;
+	delete [] work;
+}
 CVector LinearLSSolve(const CMatrix& A,
 					 const CVector& b)
+{
 	dorgqr_(&nRows,&nCols,&k,Q[0],&nRows,&TAU[0],work,&lwork,&info);
 	assert(info==0);
-	delete work;
+	delete [] work;
 	R.Transpose();
 	Q.Transpose();
 	//Set the zeros of R
 	dorgrq_(&nRows,&nCols,&k,Q[0],&nRows,&TAU[0],work,&lwork,&info);
 	assert(info==0);
-	delete work;
+	delete [] work;
 	R.Transpose();
 	Q.Transpose();
 	//Set the zeros of R
 	int info, lwork=6*n;
 	b.Resize(n);
 	double* work = new double[lwork];
 	dsyev_(&jobz, &uplo, &n, Q[0], &n, &b[0], work, &lwork, &info);
+    delete [] work;
 	return info;
+}
+}

Subversion Repositories gelsvn

(root)/trunk/src/LinAlg/LapackFunc.cpp @ 379 – Rev 379 → 595