[Scipy-svn] r3873 - trunk/scipy/fftpack/src

scipy-svn@scip... scipy-svn@scip...
Mon Jan 28 11:02:40 CST 2008


Author: rkern
Date: 2008-01-28 11:02:36 -0600 (Mon, 28 Jan 2008)
New Revision: 3873

Modified:
   trunk/scipy/fftpack/src/zfft_fftw3.c
   trunk/scipy/fftpack/src/zfftnd_fftpack.c
Log:
Remove // comments from C code.

Modified: trunk/scipy/fftpack/src/zfft_fftw3.c
===================================================================
--- trunk/scipy/fftpack/src/zfft_fftw3.c	2008-01-27 07:56:20 UTC (rev 3872)
+++ trunk/scipy/fftpack/src/zfft_fftw3.c	2008-01-28 17:02:36 UTC (rev 3873)
@@ -1,5 +1,5 @@
 
-// This cache uses FFTW_MEASURE for the plans, and do not copy the data.
+/* This cache uses FFTW_MEASURE for the plans, and do not copy the data. */
 GEN_CACHE(zfftw3,(int n,int d)
 	,int direction;
 	fftw_plan plan;
@@ -7,19 +7,17 @@
 	,((caches_zfftw3[i].n==n) &&
 	    (caches_zfftw3[i].direction==d))
 	,caches_zfftw3[id].direction = d;
-        // This working buffer is only used to compute the plan: we need it
-        // since FFTW_MEASURE destroys its input when computing a plan
+        /* This working buffer is only used to compute the plan: we need it
+           since FFTW_MEASURE destroys its input when computing a plan */
 	    caches_zfftw3[id].wrk = fftw_malloc(n * sizeof(double) * 2); 
 	    caches_zfftw3[id].plan = fftw_plan_dft_1d(n, 
 	        caches_zfftw3[id].wrk,
 	        caches_zfftw3[id].wrk,
 		(d>0?FFTW_FORWARD:FFTW_BACKWARD),
 		FFTW_ESTIMATE | FFTW_UNALIGNED);
-	,//fftw_print_plan(caches_zfftw3[id].plan);
+	,
     fftw_destroy_plan(caches_zfftw3[id].plan);
 	fftw_free(caches_zfftw3[id].wrk);
-    //fflush(stdout);
-    //fprintf(stderr, "aligned count %d\n", countaligned);
 	,10)
 
 static void zfft_fftw3(complex_double * inout, int n, int dir, int
@@ -56,8 +54,6 @@
 		for (i = n * howmany - 1; i >= 0; --i) {
 			*((double *) (ptr)) *= factor;
 			*((double *) (ptr++) + 1) *= factor;
-			//*((double *) (ptr)) /= n;
-			//*((double *) (ptr++) + 1) /= n;
 		}
 	}
 }

Modified: trunk/scipy/fftpack/src/zfftnd_fftpack.c
===================================================================
--- trunk/scipy/fftpack/src/zfftnd_fftpack.c	2008-01-27 07:56:20 UTC (rev 3872)
+++ trunk/scipy/fftpack/src/zfftnd_fftpack.c	2008-01-28 17:02:36 UTC (rev 3873)
@@ -89,8 +89,6 @@
     for (i = 0; i < rank; ++i) {
         sz *= dims[i];
     }
-    //zfft_fftpack(ptr, dims[rank - 1], direction, howmany * sz / dims[rank - 1],
-    //     normalize);
     zfft(ptr, dims[rank - 1], direction, howmany * sz / dims[rank - 1],
 	 normalize);
 
@@ -112,7 +110,6 @@
                 }
             }
             flatten(tmp, ptr, rank, itmp[axis], dims[axis], 0, itmp);
-            //zfft_fftpack(tmp, dims[axis], direction, sz / dims[axis], normalize);
             zfft(tmp, dims[axis], direction, sz / dims[axis], normalize);
             flatten(ptr, tmp, rank, itmp[axis], dims[axis], 1, itmp);
         }



More information about the Scipy-svn mailing list