[PD-cvs] SF.net SVN: pure-data:[10557] trunk/externals/iem/iemmatrix/src

[fzotter at users.sourceforge.net]

Revision: 10557
          http://pure-data.svn.sourceforge.net/pure-data/?rev=10557&view=rev
Author:   fzotter
Date:     2009-01-15 11:13:32 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
corrected the dependency of [mtx_eig] on recent gsl versions

Modified Paths:
--------------
    trunk/externals/iem/iemmatrix/src/configure.ac
    trunk/externals/iem/iemmatrix/src/mtx_eig.c

Modified: trunk/externals/iem/iemmatrix/src/configure.ac
===================================================================
--- trunk/externals/iem/iemmatrix/src/configure.ac	2009-01-14 21:38:14 UTC (rev 10556)
+++ trunk/externals/iem/iemmatrix/src/configure.ac	2009-01-15 11:13:32 UTC (rev 10557)
@@ -76,6 +76,7 @@
 dnl AC_CHECK_LIB([m], [cos])
 AC_CHECK_LIB([gslcblas], [cblas_dgemm])
 AC_CHECK_LIB([gsl], [gsl_blas_dgemm])
+AC_CHECK_FUNCS([gsl], [gsl_eigen_nonsymm], )
 
 
 if test "x$with_pd" != "x"; then

Modified: trunk/externals/iem/iemmatrix/src/mtx_eig.c
===================================================================
--- trunk/externals/iem/iemmatrix/src/mtx_eig.c	2009-01-14 21:38:14 UTC (rev 10556)
+++ trunk/externals/iem/iemmatrix/src/mtx_eig.c	2009-01-15 11:13:32 UTC (rev 10557)
@@ -26,7 +26,7 @@
 struct _MTXEig_
 {
   t_object x_obj;
-#ifdef HAVE_LIBGSL
+#ifdef HAVE_LIBGSL_EIGEN_NONSYMM
   gsl_matrix *a;
   gsl_matrix_complex *q;
   gsl_vector_complex *l;
@@ -45,7 +45,7 @@
   enum WithEigenVectors withevs;
 };
 
-#ifdef HAVE_LIBGSL
+#ifdef HAVE_LIBGSL_EIGEN_NONSYMM
 static void allocMTXqlw (MTXEig *x) 
 {
      x->a=(gsl_matrix*)gsl_matrix_alloc(x->size,x->size);
@@ -103,7 +103,7 @@
 
 static void deleteMTXEig (MTXEig *x) 
 {
-#ifdef HAVE_LIBGSL
+#ifdef HAVE_LIBGSL_EIGEN_NONSYMM 
    deleteMTXqlw(x);
 #endif
 }
@@ -124,7 +124,7 @@
   x->list_l_im = 0;
   x->list_q_re = 0; 
   x->list_q_im = 0; 
-#ifdef HAVE_LIBGSL
+#ifdef HAVE_LIBGSL_EIGEN_NONSYMM
   x->a=0;
   x->q=0;
   x->l=0;
@@ -159,7 +159,7 @@
   int n,m;
   float f;
 
-#ifdef HAVE_LIBGSL
+#ifdef HAVE_LIBGSL_EIGEN_NONSYMM
   gsl_complex c;
   /* size check */
   if (!size) 
@@ -205,7 +205,7 @@
     mTXEigBang(x);
   }
 #else
-    post("mtx_eig: implementation requires gsl");
+    post("mtx_eig: implementation requires more recent gsl version to handle nonsymmetric matrices");
 #endif
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.