Changeset 2322 in Sophya for trunk/SophyaLib/TArray


Ignore:
Timestamp:
Feb 11, 2003, 4:31:10 PM (23 years ago)
Author:
cmv
Message:
  • passage xxstream.h en xxstream
  • compile avec gcc_3.2, gcc_2.96 et cxx En 3.2 le seek from ::end semble marcher (voir Eval/COS/pbseekios.cc)

rz+cmv 11/2/2003

Location:
trunk/SophyaLib/TArray
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/TArray/basarr.h

    r2286 r2322  
    88#include "machdefs.h"
    99#include <math.h>
    10 #include <iostream.h>
     10#include <iostream>
    1111#include "anydataobj.h"
    1212#include "mutyv.h"

  • trunk/SophyaLib/TArray/fioarr.h

    r958 r2322  
    77
    88#include "machdefs.h"
    9 #include <iostream.h>
     9#include <iostream>
    1010#include "tarray.h"
    1111#include "tmatrix.h"

  • trunk/SophyaLib/TArray/matharr.cc

    r1521 r2322  
    5656*/
    5757template <class T>
    58 TArray<T>& MathArray<T>::ApplyFunctionInPlace(TArray<T> & a, Arr_FloatFunctionOfX f)
    59 {
    60   if (a.NbDimensions() < 1)
    61     throw RangeCheckError("MathArray<T>::ApplyFunctionInPlace(TArray<T> & a..) Not Allocated Array a !");
     58TArray<T>& MathArray<T>::ApplyFunctionInPlaceF(TArray<T> & a, Arr_FloatFunctionOfX f)
     59{
     60  if (a.NbDimensions() < 1)
     61    throw RangeCheckError("MathArray<T>::ApplyFunctionInPlaceF(TArray<T> & a..) Not Allocated Array a !");
    6262  T * pe;
    6363  sa_size_t j,k;
    … …  
    104104*/
    105105template <class T>
    106 TArray<T> MathArray<T>::ApplyFunction(TArray<T> const & a, Arr_FloatFunctionOfX f)
     106TArray<T> MathArray<T>::ApplyFunctionF(TArray<T> const & a, Arr_FloatFunctionOfX f)
    107107{
    108108  TArray<T> ra;
    109109  ra = a;
    110   ApplyFunctionInPlace(ra, f);
     110  ApplyFunctionInPlaceF(ra, f);
    111111  return(ra);
    112112}

  • trunk/SophyaLib/TArray/matharr.h

    r1517 r2322  
    1919  // Replaces the input array content with the result f(x)
    2020  virtual TArray<T>&  ApplyFunctionInPlace(TArray<T> & a, Arr_DoubleFunctionOfX f);
    21   virtual TArray<T>&  ApplyFunctionInPlace(TArray<T> & a, Arr_FloatFunctionOfX f);
     21  virtual TArray<T>&  ApplyFunctionInPlaceF(TArray<T> & a, Arr_FloatFunctionOfX f);
    2222  // Creates a new array and fills it with f(x)
    2323  virtual TArray<T>  ApplyFunction(TArray<T> const & a, Arr_DoubleFunctionOfX f);
    24   virtual TArray<T>  ApplyFunction(TArray<T> const & a, Arr_FloatFunctionOfX f);
     24  virtual TArray<T>  ApplyFunctionF(TArray<T> const & a, Arr_FloatFunctionOfX f);
    2525  // Computing Mean-Sigma
    2626  virtual double     MeanSigma(TArray<T> const & a, double & mean, double & sig);

  • trunk/SophyaLib/TArray/sopemtx.cc

    r2147 r2322  
    33#include "machdefs.h"
    44#include <stdio.h>
    5 #include <iostream.h>
     5#include <iostream>
    66#include <complex>
    77#include <math.h>

  • trunk/SophyaLib/TArray/tarray.h

    r2286 r2322  
    88#include "machdefs.h"
    99#include <math.h>
    10 #include <iostream.h>
     10#include <iostream>
    1111#include "basarr.h"
    1212#include "ndatablock.h"

  • trunk/SophyaLib/TArray/toeplitzMatrix.h

    r1941 r2322  
    1313
    1414#include <math.h>
    15 #include <iostream.h>
     15#include <iostream>
    1616
    1717#include "nbmath.h"
Note: See TracChangeset for help on using the changeset viewer.