changeset 3572:8d641545e006

[project @ 2000-02-03 21:39:48 by jwe]
author jwe
date Thu, 03 Feb 2000 21:39:50 +0000
parents f2e2faef1220
children 6ae6f1180e62
files liboctave/CMatrix.cc liboctave/ChangeLog liboctave/dMatrix.cc src/ChangeLog src/ov-base-mat.cc
diffstat 5 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/CMatrix.cc	Thu Feb 03 11:39:10 2000 +0000
+++ b/liboctave/CMatrix.cc	Thu Feb 03 21:39:50 2000 +0000
@@ -1026,7 +1026,7 @@
     F77_FCN (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave);
 
   for (int j = 0; j < npts*nsamples; j++)
-    tmp_data[j] = tmp_data[j] / npts;
+    tmp_data[j] = tmp_data[j] / static_cast<double> (npts);
 
   return retval;
 }
@@ -1126,7 +1126,7 @@
     F77_FCN (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave);
 
   for (int j = 0; j < npts*nsamples; j++)
-    tmp_data[j] = tmp_data[j] / npts;
+    tmp_data[j] = tmp_data[j] / static_cast<double> (npts);
 
   npts = nc;
   nsamples = nr;
@@ -1148,7 +1148,7 @@
       F77_FCN (cfftb, CFFTB) (npts, prow, pwsave);
 
       for (int i = 0; i < npts; i++)
-	tmp_data[i*nr + j] = prow[i] / npts;
+	tmp_data[i*nr + j] = prow[i] / static_cast<double> (npts);
     }
 
   return retval;
--- a/liboctave/ChangeLog	Thu Feb 03 11:39:10 2000 +0000
+++ b/liboctave/ChangeLog	Thu Feb 03 21:39:50 2000 +0000
@@ -1,5 +1,10 @@
 2000-02-03  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* dMatrix.cc (Matrix::ifourier): Cast divisor to double.
+	(Matrix::ifourier2d): Likewise.
+	* CMatrix.cc (ComplexMatrix::ifourier): Likewise.
+	(ComplexMatrix::ifourier2d): Likewise.
+
 	* Array.h (Array::ArrayRep::qsort): Cast len to size_t.
 
 2000-02-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
--- a/liboctave/dMatrix.cc	Thu Feb 03 11:39:10 2000 +0000
+++ b/liboctave/dMatrix.cc	Thu Feb 03 21:39:50 2000 +0000
@@ -718,7 +718,7 @@
     F77_FCN (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave);
 
   for (int j = 0; j < npts*nsamples; j++)
-    tmp_data[j] = tmp_data[j] / npts;
+    tmp_data[j] = tmp_data[j] / static_cast<double> (npts);
 
   return retval;
 }
@@ -818,7 +818,7 @@
     F77_FCN (cfftb, CFFTB) (npts, &tmp_data[npts*j], pwsave);
 
   for (int j = 0; j < npts*nsamples; j++)
-    tmp_data[j] = tmp_data[j] / npts;
+    tmp_data[j] = tmp_data[j] / static_cast<double> (npts);
 
   npts = nc;
   nsamples = nr;
@@ -840,7 +840,7 @@
       F77_FCN (cfftb, CFFTB) (npts, prow, pwsave);
 
       for (int i = 0; i < npts; i++)
-	tmp_data[i*nr + j] = prow[i] / npts;
+	tmp_data[i*nr + j] = prow[i] / static_cast<double> (npts);
     }
 
   return retval;
--- a/src/ChangeLog	Thu Feb 03 11:39:10 2000 +0000
+++ b/src/ChangeLog	Thu Feb 03 21:39:50 2000 +0000
@@ -1,5 +1,7 @@
 2000-02-03  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* ov-base-mat.cc: Include pr-output.h here.
+
 	* DLD-FUNCTIONS/rand.cc (curr_rand_dist): Return const char *
 	instead of char *.
 
--- a/src/ov-base-mat.cc	Thu Feb 03 11:39:10 2000 +0000
+++ b/src/ov-base-mat.cc	Thu Feb 03 21:39:50 2000 +0000
@@ -33,6 +33,7 @@
 #include "oct-obj.h"
 #include "ov-base.h"
 #include "ov-base-mat.h"
+#include "pr-output.h"
 
 template <class MT>
 octave_value