Changeset 1348 in Sophya for trunk/SophyaProg/Tests

Timestamp:

Nov 26, 2000, 12:02:05 AM (25 years ago)

Author:

cmv

Message:

+ de tests (arguments de function) cmv 25/11/00

File:

• trunk/SophyaProg/Tests/tstndblk.cc (modified) (3 diffs)

trunk/SophyaProg/Tests/tstndblk.cc

@@ -10 +10 @@
 #include "pexceptions.h"
 #include "ndatablock.h"
+
+void  Fonction(NDataBlock<r_4> Arg);
+NDataBlock<r_4> Fonction2(NDataBlock<r_4> Arg);
+
+void  Fonction(NDataBlock<r_4> Arg)
+{
+cout<<"Fonction: arg.Size()="<<Arg.Size()<<" arg.Data()="<<Arg.Data()<<endl;
+}
+NDataBlock<r_4> Fonction2(NDataBlock<r_4> Arg)
+{
+cout<<"Fonction2: arg.Size()="<<Arg.Size()<<" arg.Data()="<<Arg.Data()<<endl;
+return Arg;
+}
 
 //////////////////////////////////////////////////////////////////////////////
@@ -31 +44 @@
 SophyaInit();
 const int NDim = 8;
-float *x1 = new float[NDim];
-float *x2 = new float[NDim];
-float *x3 = new float[NDim];
+r_4 *x1 = new r_4[NDim];
+r_4 *x2 = new r_4[NDim];
+r_4 *x3 = new r_4[NDim];
 for(int k=0;k<NDim;k++)
   {x1[k]=k+1; x2[k]=(k+1)*10; x3[k]=(k+1)*100;}
@@ -57 +70 @@
 //-----------------------------------------------------
 cout<<endl<<"Createur A1(3)"<<endl;
-NDataBlock<float> A1(3);
+NDataBlock<r_4> A1(3);
 cout<<endl<<"Createur B1("<<NDim<<")"<<endl;
-NDataBlock<float> B1(NDim);
+NDataBlock<r_4> B1(NDim);
 A1.FillFrom(NDim,x1); A1.Print(0,999);
 B1.FillFrom(NDim,x1); B1.Print(0,999);
 
 cout<<endl<<"Createur A2(3)"<<endl;
-NDataBlock<float> A2(3);
+NDataBlock<r_4> A2(3);
 A2.FillFrom(NDim,x2); A2.Print(0,999);
 cout<<endl<<"Createur B2("<<NDim<<")"<<endl;
-NDataBlock<float> B2(NDim);
+NDataBlock<r_4> B2(NDim);
 B2.FillFrom(NDim,x2); B2.Print(0,999);
 
 cout<<endl<<"Createur A3(3)"<<endl;
-NDataBlock<float> A3(3);
+NDataBlock<r_4> A3(3);
 A3.FillFrom(NDim,x3); A3.Print(0,999);
 cout<<endl<<"Createur B3("<<NDim<<")"<<endl;
-NDataBlock<float> B3(NDim);
+NDataBlock<r_4> B3(NDim);
 B3.FillFrom(NDim,x3); B3.Print(0,999);
 
 //-----------------------------------------------------
 cout<<endl<<"Createur par copie AA1(A1)"<<endl;
-NDataBlock<float> AA1(A1);
+NDataBlock<r_4> AA1(A1);
 
 cout<<endl<<"Createur par copie BB1(B1)"<<endl;
-NDataBlock<float> BB1(B1);
+NDataBlock<r_4> BB1(B1);
 
 {cout<<endl<<"Createur par copie {BBB1(B1)}"<<endl;
-NDataBlock<float> BBB1(B1);}
+NDataBlock<r_4> BBB1(B1);}
 
 {cout<<endl<<"Createur avec bridge {Abr("<<NDim<<",x3,new Bridge)}"<<endl;
-NDataBlock<float> Abr(NDim,x3,new Bridge);
+NDataBlock<r_4> Abr(NDim,x3,new Bridge);
 Abr.Print(0,999);
 cout<<"x3 existe encore: "<<x3[0]<<",...,"<<x3[4]<<endl;}
 
 {cout<<endl<<"Createur avec bridge {Abr("<<NDim<<",dum,NULL)}"<<endl;
-float *dum = new float[10];
+r_4 *dum = new r_4[10];
 for(int i=0;i<10;i++) dum[i] = 1000.+i;
-NDataBlock<float> Abr(10,dum);
+NDataBlock<r_4> Abr(10,dum);
 Abr.Print(0,999);}
 
 //-----------------------------------------------------
-cout<<endl<<endl;
-NDataBlock<float> AC(3);
+cout<<endl<<"Passage par argument a une fonction"<<endl;
+NDataBlock<r_4> Arg;
+cout<<"... Argument cree par defaut"<<endl;
+Fonction(Arg);
+cout<<"... Argument normal"<<endl;
+Fonction(A1);
+
+cout<<endl<<"Passage par argument a une fonction avec retour d un NDataBlock"<<endl;
+cout<<"... Argument cree par defaut"<<endl;
+NDataBlock<r_4> fdum = Fonction2(Arg); cout<<fdum;
+NDataBlock<r_4> fdum1(Fonction2(Arg)); cout<<fdum1;
+cout<<"... Argument normal"<<endl;
+NDataBlock<r_4> fdum2 = Fonction2(A1); cout<<fdum2;
+NDataBlock<r_4> fdum3(Fonction2(A1)); cout<<fdum3;
+
+//-----------------------------------------------------
+cout<<endl<<endl;
+NDataBlock<r_4> AC(3);
 AC.Reset();
 cout<<endl<<"AC=2"<<endl;