Changeset 2930 in Sophya for trunk/SophyaPI/PIext


Ignore:
Timestamp:
Apr 3, 2006, 11:24:35 AM (19 years ago)
Author:
ansari
Message:

Instanciation explicite Adapterde NamedObjMgr et enregsitrement pour la prise en charge des tableaux (TArray/TMatrix/TVector) de type <int_2> <uint_2> <int_8> - Reza 3/4/2006

Location:
trunk/SophyaPI/PIext
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/nomtarradapter.cc

    r2689 r2930  
    6666}
    6767
    68 /* --Methode-- */
    69 template <class T>
    70 void NOMAdapter_TArray<T>::ReadFits(string const & flnm)
    71 {
    72   FitsInFile fis(flnm);
    73   fis >> (*mArr);
    74 }
    75 
    76 /* --Methode-- */
    77 template <class T>
    78 void NOMAdapter_TArray<T>::SaveFits(string const & flnm)
    79 {
    80   FitsOutFile fos(flnm);
    81   fos << (*mArr);
    82 }
    83 
    84 // ---- Specialisation pour complexes -----
    85 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    86 void NOMAdapter_TArray< complex<r_4> >::ReadFits(string const & flnm)
    87 {
    88 cout << " NOMAdapter_TArray< complex<r_4> >::ReadFits() - Error "
    89      << " Not supported (complex data type)" << endl;
    90 }
    91 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    92 void NOMAdapter_TArray< complex<r_4> >::SaveFits(string const & flnm)
    93 {
    94 cout << " NOMAdapter_TArray< complex<r_4> >::SaveFits() - Error "
    95      << " Not supported (complex data type)" << endl;
    96 }
    97 
    98 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    99 void NOMAdapter_TArray< complex<r_8> >::ReadFits(string const & flnm)
    100 {
    101 cout << " NOMAdapter_TArray< complex<r_8> >::ReadFits() - Error "
    102      << " Not supported (complex data type)" << endl;
    103 }
    104 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    105 void NOMAdapter_TArray< complex<r_8> >::SaveFits(string const & flnm)
    106 {
    107 cout << " NOMAdapter_TArray< complex<r_8> >::SaveFits() - Error "
    108      << " Not supported (complex data type)" << endl;
    109 }
    11068
    11169/* --Methode-- */
    … …  
    268226
    269227#ifdef __CXX_PRAGMA_TEMPLATES__
    270 //#pragma define_template NOMAdapter_TArray<uint_2>
    271 //#pragma define_template NOMAdapter_TArray<int_2>
     228#pragma define_template NOMAdapter_TArray<uint_2>
     229#pragma define_template NOMAdapter_TArray<int_2>
    272230#pragma define_template NOMAdapter_TArray<int_4>
     231#pragma define_template NOMAdapter_TArray<int_8>
    273232#pragma define_template NOMAdapter_TArray<r_4>
    274233#pragma define_template NOMAdapter_TArray<r_8>
    275234#pragma define_template NOMAdapter_TArray< complex<r_4> >
    276235#pragma define_template NOMAdapter_TArray< complex<r_8> >
    277 //#pragma define_template NTupInt_TArray<uint_2>
    278 //#pragma define_template NTupInt_TArray<int_2>
     236#pragma define_template NTupInt_TArray<uint_2>
     237#pragma define_template NTupInt_TArray<int_2>
    279238#pragma define_template NTupInt_TArray<int_4>
     239#pragma define_template NTupInt_TArray<int_8>
    280240#pragma define_template NTupInt_TArray<r_4>
    281241#pragma define_template NTupInt_TArray<r_8>
    … …  
    285245
    286246#if defined(ANSI_TEMPLATES)
    287 //template class NOMAdapter_TArray<uint_2>;
    288 //template class NOMAdapter_TArray<int_2>;
     247template class NOMAdapter_TArray<uint_2>;
     248template class NOMAdapter_TArray<int_2>;
    289249template class NOMAdapter_TArray<int_4>;
     250template class NOMAdapter_TArray<int_8>;
    290251template class NOMAdapter_TArray<r_4>;
    291252template class NOMAdapter_TArray<r_8>;
    292253template class NOMAdapter_TArray< complex<r_4> >;
    293254template class NOMAdapter_TArray< complex<r_8> >;
    294 // template class NTupInt_TArray<uint_2>;
    295 // template class NTupInt_TArray<int_2>;
     255template class NTupInt_TArray<uint_2>;
     256template class NTupInt_TArray<int_2>;
    296257template class NTupInt_TArray<int_4>;
     258template class NTupInt_TArray<int_8>;
    297259template class NTupInt_TArray<r_4>;
    298260template class NTupInt_TArray<r_8>;

  • trunk/SophyaPI/PIext/nomtarradapter.h

    r2683 r2930  
    2727  virtual AnyDataObj*           CloneDataObj(bool share=false);
    2828
    29   virtual void                  ReadFits(string const & flnm);
    30   virtual void                  SaveFits(string const & flnm);
    3129  virtual void                  SavePPF(POutPersist& s, string const & nom);
    3230

  • trunk/SophyaPI/PIext/nomtmatvecadapter.cc

    r2689 r2930  
    7272}
    7373
    74 /* --Methode-- */
    75 template <class T>
    76 void NOMAdapter_TMatrix<T>::ReadFits(string const & flnm)
    77 {
    78   FitsInFile fis(flnm);
    79   fis >> (*mMtx);
    80 }
    81 
    82 /* --Methode-- */
    83 template <class T>
    84 void NOMAdapter_TMatrix<T>::SaveFits(string const & flnm)
    85 {
    86   FitsOutFile fos(flnm);
    87   fos << (*mMtx);
    88 }
    89 // ---- Specialisation pour complexes -----
    90 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    91 void NOMAdapter_TMatrix< complex<r_4> >::ReadFits(string const & flnm)
    92 {
    93 cout << " NOMAdapter_TMatrix< complex<r_4> >::ReadFits() - Error "
    94      << " Not supported (complex data type)" << endl;
    95 }
    96 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    97 void NOMAdapter_TMatrix< complex<r_4> >::SaveFits(string const & flnm)
    98 {
    99 cout << " NOMAdapter_TMatrix< complex<r_4> >::SaveFits() - Error "
    100      << " Not supported (complex data type)" << endl;
    101 }
    102 
    103 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    104 void NOMAdapter_TMatrix< complex<r_8> >::ReadFits(string const & flnm)
    105 {
    106 cout << " NOMAdapter_TMatrix< complex<r_8> >::ReadFits() - Error "
    107      << " Not supported (complex data type)" << endl;
    108 }
    109 DECL_TEMP_SPEC  /* equivalent a template <> , pour SGI-CC en particulier */
    110 void NOMAdapter_TMatrix< complex<r_8> >::SaveFits(string const & flnm)
    111 {
    112 cout << " NOMAdapter_TMatrix< complex<r_8> >::SaveFits() - Error "
    113      << " Not supported (complex data type)" << endl;
    114 }
    11574
    11675/* --Methode-- */
    … …  
    390349
    391350#ifdef __CXX_PRAGMA_TEMPLATES__
    392 //#pragma define_template NOMAdapter_TMatrix<uint_2>
    393 //#pragma define_template NOMAdapter_TMatrix<int_2>
     351#pragma define_template NOMAdapter_TMatrix<uint_2>
     352#pragma define_template NOMAdapter_TMatrix<int_2>
    394353#pragma define_template NOMAdapter_TMatrix<int_4>
     354#pragma define_template NOMAdapter_TMatrix<int_8>
    395355#pragma define_template NOMAdapter_TMatrix<r_4>
    396356#pragma define_template NOMAdapter_TMatrix<r_8>
    397357#pragma define_template NOMAdapter_TMatrix< complex<r_4> >
    398358#pragma define_template NOMAdapter_TMatrix< complex<r_8> >
    399 //#pragma define_template NTupInt_TMatrix<uint_2>
    400 //#pragma define_template NTupInt_TMatrix<int_2>
     359#pragma define_template NTupInt_TMatrix<uint_2>
     360#pragma define_template NTupInt_TMatrix<int_2>
    401361#pragma define_template NTupInt_TMatrix<int_4>
     362#pragma define_template NTupInt_TMatrix<int_8>
    402363#pragma define_template NTupInt_TMatrix<r_4>
    403364#pragma define_template NTupInt_TMatrix<r_8>
    … …  
    407368
    408369#if defined(ANSI_TEMPLATES)
    409 //template class NOMAdapter_TMatrix<uint_2>;
    410 //template class NOMAdapter_TMatrix<int_2>;
     370template class NOMAdapter_TMatrix<uint_2>;
     371template class NOMAdapter_TMatrix<int_2>;
    411372template class NOMAdapter_TMatrix<int_4>;
     373template class NOMAdapter_TMatrix<int_8>;
    412374template class NOMAdapter_TMatrix<r_4>;
    413375template class NOMAdapter_TMatrix<r_8>;
    414376template class NOMAdapter_TMatrix< complex<r_4> >;
    415377template class NOMAdapter_TMatrix< complex<r_8> >;
    416 // template class NTupInt_TMatrix<uint_2>;
    417 // template class NTupInt_TMatrix<int_2>;
     378template class NTupInt_TMatrix<uint_2>;
     379template class NTupInt_TMatrix<int_2>;
    418380template class NTupInt_TMatrix<int_4>;
     381template class NTupInt_TMatrix<int_8>;
    419382template class NTupInt_TMatrix<r_4>;
    420383template class NTupInt_TMatrix<r_8>;

  • trunk/SophyaPI/PIext/nomtmatvecadapter.h

    r2683 r2930  
    2828  virtual AnyDataObj*           CloneDataObj(bool share=false);
    2929
    30   virtual void                  ReadFits(string const & flnm);
    31   virtual void                  SaveFits(string const & flnm);
    3230  virtual void                  SavePPF(POutPersist& s, string const & nom);
    3331

  • trunk/SophyaPI/PIext/piinit.cc

    r2701 r2930  
    6464  serv->RegisterClass(new Matrix, new NOMAdapter_Matrix );
    6565#else
     66  serv->RegisterClass(new TArray<uint_2>, new NOMAdapter_TArray<uint_2> );
     67  serv->RegisterClass(new TArray<int_2>, new NOMAdapter_TArray<int_2> );
    6668  serv->RegisterClass(new TArray<int_4>, new NOMAdapter_TArray<int_4> );
     69  serv->RegisterClass(new TArray<int_8>, new NOMAdapter_TArray<int_8> );
    6770  serv->RegisterClass(new TArray<r_4>, new NOMAdapter_TArray<r_4> );
    6871  serv->RegisterClass(new TArray<r_8>, new NOMAdapter_TArray<r_8> );
    … …  
    7073  serv->RegisterClass(new TArray<complex<r_8> >, new NOMAdapter_TArray<complex<r_8> > );
    7174
     75  serv->RegisterClass(new TVector<uint_2>, new NOMAdapter_TMatrix<uint_2> );
     76  serv->RegisterClass(new TMatrix<uint_2>, new NOMAdapter_TMatrix<uint_2> );
     77  serv->RegisterClass(new TVector<int_2>, new NOMAdapter_TMatrix<int_2> );
     78  serv->RegisterClass(new TMatrix<int_2>, new NOMAdapter_TMatrix<int_2> );
    7279  serv->RegisterClass(new TVector<int_4>, new NOMAdapter_TMatrix<int_4> );
    7380  serv->RegisterClass(new TMatrix<int_4>, new NOMAdapter_TMatrix<int_4> );
     81  serv->RegisterClass(new TVector<int_8>, new NOMAdapter_TMatrix<int_8> );
     82  serv->RegisterClass(new TMatrix<int_8>, new NOMAdapter_TMatrix<int_8> );
    7483  serv->RegisterClass(new TVector<r_4>, new NOMAdapter_TMatrix<r_4> );
    7584  serv->RegisterClass(new TMatrix<r_4>, new NOMAdapter_TMatrix<r_4> );

  • trunk/SophyaPI/PIext/pitvmaad.cc

    r2615 r2930  
    9191
    9292#ifdef __CXX_PRAGMA_TEMPLATES__
     93#pragma define_template POTVectorAdapter< uint_2 >
     94#pragma define_template POTVectorAdapter< int_2 >
    9395#pragma define_template POTVectorAdapter< int_4 >
    9496#pragma define_template POTVectorAdapter< int_8 >
    … …  
    98100#pragma define_template POTVectorAdapter< complex<double> >
    99101
     102#pragma define_template POTMatrixAdapter< uint_2 >
     103#pragma define_template POTMatrixAdapter< int_2 >
    100104#pragma define_template POTMatrixAdapter< int_4 >
    101105#pragma define_template POTMatrixAdapter< int_8 >
    … …  
    107111
    108112#if defined(ANSI_TEMPLATES)
     113template class POTVectorAdapter< uint_2 >;
     114template class POTVectorAdapter< int_2 >;
    109115template class POTVectorAdapter< int_4 >;
    110116template class POTVectorAdapter< int_8 >;
    … …  
    114120template class POTVectorAdapter< complex<double> >;
    115121
     122template class POTMatrixAdapter< uint_2 >;
     123template class POTMatrixAdapter< int_2 >;
    116124template class POTMatrixAdapter< int_4 >;
    117125template class POTMatrixAdapter< int_8 >;
Note: See TracChangeset for help on using the changeset viewer.