From 3935ba39d30666dd7d4a831155631847c77b70c4 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Wed, 2 Aug 2017 08:46:58 +0000
Subject: Massive patch using LLVM coding style. It was generated with:
clang-format -style=LLVM -i *.cpp *.h
Please set your editor to replace tabs with spaces and use indentation of 2 spaces.
---
src/eigenlib.cpp | 103 +++++++++++++++++++++++++++----------------------------
1 file changed, 50 insertions(+), 53 deletions(-)
(limited to 'src/eigenlib.cpp')
diff --git a/src/eigenlib.cpp b/src/eigenlib.cpp
index 733dae1..a8c545c 100644
--- a/src/eigenlib.cpp
+++ b/src/eigenlib.cpp
@@ -16,13 +16,13 @@
along with this program. If not, see .
*/
-#include
+#include "Eigen/Dense"
+#include "gsl/gsl_linalg.h"
+#include "gsl/gsl_matrix.h"
+#include "gsl/gsl_vector.h"
#include
+#include
#include
-#include "gsl/gsl_vector.h"
-#include "gsl/gsl_matrix.h"
-#include "gsl/gsl_linalg.h"
-#include "Eigen/Dense"
using namespace std;
using namespace Eigen;
@@ -34,82 +34,79 @@ using namespace Eigen;
// eigen, 1x or 0.3x slower than lapack
// invert, 20x or 10x faster than lapack
//
-void eigenlib_dgemm (const char *TransA, const char *TransB,
- const double alpha, const gsl_matrix *A,
- const gsl_matrix *B, const double beta,
- gsl_matrix *C) {
- Map, 0, OuterStride >
- A_mat(A->data, A->size1, A->size2, OuterStride(A->tda) );
- Map, 0, OuterStride >
- B_mat(B->data, B->size1, B->size2, OuterStride(B->tda) );
- Map, 0, OuterStride >
- C_mat(C->data, C->size1, C->size2, OuterStride(C->tda) );
+void eigenlib_dgemm(const char *TransA, const char *TransB, const double alpha,
+ const gsl_matrix *A, const gsl_matrix *B, const double beta,
+ gsl_matrix *C) {
+ Map, 0, OuterStride>
+ A_mat(A->data, A->size1, A->size2, OuterStride(A->tda));
+ Map, 0, OuterStride>
+ B_mat(B->data, B->size1, B->size2, OuterStride(B->tda));
+ Map, 0, OuterStride>
+ C_mat(C->data, C->size1, C->size2, OuterStride(C->tda));
- if (*TransA=='N' || *TransA=='n') {
- if (*TransB=='N' || *TransB=='n') {
- C_mat=alpha*A_mat*B_mat+beta*C_mat;
+ if (*TransA == 'N' || *TransA == 'n') {
+ if (*TransB == 'N' || *TransB == 'n') {
+ C_mat = alpha * A_mat * B_mat + beta * C_mat;
} else {
- C_mat=alpha*A_mat*B_mat.transpose()+beta*C_mat;
+ C_mat = alpha * A_mat * B_mat.transpose() + beta * C_mat;
}
} else {
- if (*TransB=='N' || *TransB=='n') {
- C_mat=alpha*A_mat.transpose()*B_mat+beta*C_mat;
+ if (*TransB == 'N' || *TransB == 'n') {
+ C_mat = alpha * A_mat.transpose() * B_mat + beta * C_mat;
} else {
- C_mat=alpha*A_mat.transpose()*B_mat.transpose()+beta*C_mat;
+ C_mat = alpha * A_mat.transpose() * B_mat.transpose() + beta * C_mat;
}
}
return;
}
-void eigenlib_dgemv (const char *TransA, const double alpha,
- const gsl_matrix *A, const gsl_vector *x,
- const double beta, gsl_vector *y) {
- Map, 0, OuterStride >
- A_mat(A->data, A->size1, A->size2, OuterStride(A->tda) );
- Map, 0, InnerStride >
- x_vec(x->data, x->size, InnerStride(x->stride) );
- Map, 0, InnerStride >
- y_vec(y->data, y->size, InnerStride(y->stride) );
+void eigenlib_dgemv(const char *TransA, const double alpha, const gsl_matrix *A,
+ const gsl_vector *x, const double beta, gsl_vector *y) {
+ Map, 0, OuterStride>
+ A_mat(A->data, A->size1, A->size2, OuterStride(A->tda));
+ Map, 0, InnerStride> x_vec(
+ x->data, x->size, InnerStride(x->stride));
+ Map, 0, InnerStride> y_vec(
+ y->data, y->size, InnerStride(y->stride));
- if (*TransA=='N' || *TransA=='n') {
- y_vec=alpha*A_mat*x_vec+beta*y_vec;
+ if (*TransA == 'N' || *TransA == 'n') {
+ y_vec = alpha * A_mat * x_vec + beta * y_vec;
} else {
- y_vec=alpha*A_mat.transpose()*x_vec+beta*y_vec;
+ y_vec = alpha * A_mat.transpose() * x_vec + beta * y_vec;
}
return;
}
void eigenlib_invert(gsl_matrix *A) {
- Map >
- A_mat(A->data, A->size1, A->size2);
- A_mat=A_mat.inverse();
+ Map> A_mat(A->data, A->size1,
+ A->size2);
+ A_mat = A_mat.inverse();
return;
}
-void eigenlib_dsyr (const double alpha, const gsl_vector *b, gsl_matrix *A) {
- Map >
- A_mat(A->data, A->size1, A->size2);
- Map, 0, OuterStride >
- b_vec(b->data, b->size, OuterStride(b->stride) );
- A_mat=alpha*b_vec*b_vec.transpose()+A_mat;
+void eigenlib_dsyr(const double alpha, const gsl_vector *b, gsl_matrix *A) {
+ Map> A_mat(A->data, A->size1,
+ A->size2);
+ Map, 0, OuterStride> b_vec(
+ b->data, b->size, OuterStride(b->stride));
+ A_mat = alpha * b_vec * b_vec.transpose() + A_mat;
return;
}
-void eigenlib_eigensymm (const gsl_matrix *G, gsl_matrix *U,
- gsl_vector *eval) {
- Map, 0, OuterStride >
- G_mat(G->data, G->size1, G->size2, OuterStride(G->tda) );
- Map, 0, OuterStride >
- U_mat(U->data, U->size1, U->size2, OuterStride(U->tda) );
- Map, 0, OuterStride >
- eval_vec(eval->data, eval->size, OuterStride(eval->stride) );
+void eigenlib_eigensymm(const gsl_matrix *G, gsl_matrix *U, gsl_vector *eval) {
+ Map, 0, OuterStride>
+ G_mat(G->data, G->size1, G->size2, OuterStride(G->tda));
+ Map, 0, OuterStride>
+ U_mat(U->data, U->size1, U->size2, OuterStride(U->tda));
+ Map, 0, OuterStride> eval_vec(
+ eval->data, eval->size, OuterStride(eval->stride));
SelfAdjointEigenSolver es(G_mat);
if (es.info() != Success)
abort();
- eval_vec=es.eigenvalues();
- U_mat=es.eigenvectors();
+ eval_vec = es.eigenvalues();
+ U_mat = es.eigenvectors();
return;
}
--
cgit v1.2.3