Changeset 805 in Sophya for trunk/SophyaLib/NTools

Timestamp:

Apr 3, 2000, 7:41:08 PM (25 years ago)

Author:

ansari

Message:

Adaptation aux modifications de TArray<T>/TVector<T> - linfit.cc integre
a TArray/sopemtx.cc - Reza 03/04/2000

Location:

trunk/SophyaLib/NTools

Files:

• NTools.o.list (modified) (1 diff)
• fftmserver.cc (modified) (5 diffs)
• fftpserver.cc (modified) (2 diffs)
• linfit.cc (deleted)
• linfit.h (modified) (2 diffs)
• objfitter.h (modified) (1 diff)
• poly.cc (modified) (4 diffs)
• poly.h (modified) (5 diffs)

trunk/SophyaLib/NTools/NTools.o.list

@@ -19 +19 @@
 imageop.o
 integ.o
-linfit.o
 matxop.o
 median.o

trunk/SophyaLib/NTools/fftmserver.cc

@@ -184 +184 @@
 void FFTMayerServer::FFTForward(TVector< r_4 > const & in, TVector< complex<r_4> > & out)
 {
- r_4 a,b,c,d;
+ r_4 a,b;
  int i,j,k;
  int n = in.NElts();
@@ -227 +227 @@
 void FFTMayerServer::FFTBackward(TVector< complex<r_4> > const & in, TVector< r_4 > & out)
 {
- r_4 a,b,c,d;
+ r_4 a,b;
  int i,j,k;
  int n = in.NElts();
@@ -269 +269 @@
 void FFTMayerServer::FFTForward(TVector< r_8 > const & in, TVector< complex<r_8> > & out)
 {
- r_8 a,b,c,d;
+ r_8 a,b;
  int i,j,k;
  int n = in.NElts();
@@ -311 +311 @@
 void FFTMayerServer::FFTBackward(TVector< complex<r_8> > const & in, TVector< r_8 > & out)
 {
- r_8 a,b,c,d;
+ r_8 a,b;
  int i,j,k;
  int n = in.NElts();
@@ -356 +356 @@
   if (n < 2) return(true);
   int nc = n;
-  int r;
   while (nc > 1) {
     if (nc%2 != 0)  return(true);

trunk/SophyaLib/NTools/fftpserver.cc

@@ -288 +288 @@
   out.ReSize(ncs);
   out(0) = complex<r_8> (in(0),0.);
-  int k;
   for(int k=1;k<nc;k++) 
     out(k) =  complex<r_4> (in(2*k-1), in(2*k));
@@ -303 +302 @@
   out.ReSize(ncs);
   out(0) = complex<r_4> (in(0),0.);
-  int k;
   for(int k=1;k<nc;k++) 
     out(k) =  complex<r_4> (in(2*k-1), in(2*k));

trunk/SophyaLib/NTools/linfit.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: linfit.h,v 1.6 1999-11-05 13:08:30 ansari Exp $
+// $Id: linfit.h,v 1.7 2000-04-03 17:41:07 ansari Exp $
 //
 
@@ -9 +9 @@
 #define LINFIT_SEEN
 
-#include "machdefs.h"
-#include "tvector.h"
+// Mis ds TArray/sopemtx.h  - fichier garde pour back-compatibilite
+//                                       Reza 03/2000
+#include "sopemtx.h"
 
-namespace SOPHYA {
-
-class LinFitter {
-public :
-                LinFitter();
-  virtual       ~LinFitter();
-
-  double        LinFit(const Vector& x, const Vector& y, int nf,
-                       double (*f)(int, double), Vector& c);
-// fit lineaire des y en tant que somme de c(i)f(i,x), i=0..nf-1;
-
-  double        LinFit(const Matrix& fx, const Vector& y, Vector& c);
-// fit lineaire des y en tant que somme de c(i)f(i,x), i=0..nf-1,
-// la matrice fx contient les valeurs des f:
-// fx(i,j) = f(i, x(j)).
-                      
-  double        LinFit(const Vector& x, const Vector& y, const Vector& errY2, int nf,
-                       double (*f)(int, double), Vector& c, Vector& errC);
-// fit lineaire des y en tant que somme de c(i)f(i,x), i=0..nf-1,
-// errY2 contient les carres des erreurs sur les Y.
-// au retour, errC contient les erreurs sur les coefs.
-
-  double        LinFit(const Matrix& fx, const Vector& y, const Vector& errY2,
-                       Vector& c, Vector& errC);
-// fit lineaire des y en tant que somme de c(i)f(i,x), i=0..nf-1,
-// la matrice fx contient les valeurs des f:
-// fx(i,j) = f(i, x(j)).
-// errY2 contient les carres des erreurs sur les Y.
-// au retour, errC contient les erreurs sur les coefs.
-};
-
-} // Fin du namespace
 
 #endif // LINFIT_SEEN 

trunk/SophyaLib/NTools/objfitter.h

@@ -60 +60 @@
 
 
-#endif   // ARRFITTER_SEEN
+#endif   // OBJFITTER_SEEN

trunk/SophyaLib/NTools/poly.cc

@@ -2 +2 @@
 #include "poly.h"
 #include "linfit.h"
+#include "fioarr.h"
 
 //++
@@ -254 +255 @@
 
 //++
-void Poly::Print(ostream& s) const
+void Poly::Print(ostream& s, int_4 , bool ) const
 //
 //      Impresssion.
@@ -484 +485 @@
   Poly2 tmp(*this);
   Vector::Realloc((degreX+1)*(degreY+1));
-  Reset();
+  DataBlock().Reset();
   maxDegX = degreX;
   maxDegY = degreY;
@@ -721 +722 @@
 
 //++
-void Poly2::Print(ostream& s) const
+void Poly2::Print(ostream& s, int_4 , bool ) const
 //
 //      Impression sur stream s.

trunk/SophyaLib/NTools/poly.h

@@ -1 +1 @@
 // This may look like C code, but it is really -*- C++ -*-
 //
-// $Id: poly.h,v 1.4 1999-11-05 13:08:31 ansari Exp $
+// $Id: poly.h,v 1.5 2000-04-03 17:41:08 ansari Exp $
 //
 
@@ -34 +34 @@
   inline void Realloc(int n, bool force=false) {Vector::Realloc(n+1,force);}
 
-  inline double operator[](int i) const {return Element(i);}
-  inline double& operator[](int i) {dirty = 1; return Element(i);}
+  //  Pour compatibilite PEIDA  - Reza 03/2000
+  inline double Element(int i) const { return Elem(i,0,0,0,0); } 
+  inline double & Element(int i)  { return Elem(i,0,0,0,0); } 
+
+  inline double operator[](int i) const {return Elem(i,0,0,0,0);}
+  inline double& operator[](int i) {dirty = 1; return Elem(i,0,0,0,0);}
   // Retourne le coefficient de degre i
 
@@ -68 +72 @@
   Poly2 operator() (Poly2 const& b) const;
 
-  void Print(ostream& s) const;
+  void Print(ostream& s, int_4 maxprt=-1, bool si=false) const;
 
   double Fit(Vector const& x, Vector const& y, int degre);
@@ -131 +135 @@
   inline int Deg()  const {UpdateDegIfDirty(); return deg;}
   // les degres partiels en x et y, et totaux.
+
+  //  Pour compatibilite PEIDA  - Reza 03/2000
+  inline double Element(int i) const { return Elem(i,0,0,0,0); } 
+  inline double & Element(int i)  { return Elem(i,0,0,0,0); } 
 
   double operator()(double x, double y) const;
@@ -183 +191 @@
   void Realloc(int degreX, int degreY);
 
-  void Print(ostream& s) const;
+  void Print(ostream& s, int_4 maxprt=-1, bool si=false) const;
 
 private: