Changeset 4062 in Sophya for trunk/SophyaLib/BaseTools/pqnumber.cc

Timestamp:

Apr 27, 2012, 12:26:07 AM (13 years ago)

Author:

ansari

Message:

Petites ameliorations classes Units et PhysQty, documentation doxygen, ajout fichiers pqnumber.h et sunitpcst.h ds basetools.h, passage numero de version a 2.30, Reza 27/04/2012

File:

• trunk/SophyaLib/BaseTools/pqnumber.cc (modified) (3 diffs)

trunk/SophyaLib/BaseTools/pqnumber.cc

@@ -15 +15 @@
    \code
    // Create a PrimeNumbers object 
+   // Create a PrimeNumbers object 
    PrimeNumbers primes;
-   // Print the first 15 primes ...
-   for(size_t k=0; k<15; k++) 
-     cout << primes(k) << endl; 
+   // Print the prime numbers from rank 20 to 25 ...
+   cout << " Primes[20...30]: " ; 
+   for(size_t k=19; k<30; k++) cout << primes(k) << "  "; 
    // Print all prime numbers less than some max values
-   uint_8 pmax = 223;
-   uint_8 p = primes.Next();
+   uint_8 p = primes.Next();  uint_8 pmax = 223;
+   cout << endl << " Primes < " << pmax << " : " << endl;
    while (p<pmax) {
-     cout << p << endl;
-     p = primes.Next();
+    cout << p << "  ";
+    p = primes.Next();
    }
+   cout << endl; 
+   // Compute and print prime factor decomposition:
+   uint_8 nombre=247890;
+   vector<uint_8> pfac=primes.PrimeFactors(nombre, true);
+   cout << " PrimeFactors[" << nombre << "]: "; 
+   for(size_t i=0; i<pfac.size(); i++) cout << pfac[i] << "   ";   
+   cout << endl;
    \endcode
 */
@@ -266 +274 @@
    
    \code
-   // Create rational numbers from integers
+   // Create rational numbers from pairs of integers
    QNumber q1(3,4), q2(5,6), q3(6,8);
    // Operations and comparsion
@@ -272 +280 @@
    cout << q1 << " + " << q2 << " = " << q4 << endl;
    QNumber qa(q1), qb(q2);
-   cout " Test qa==qb : -> " << qa << " ?== " << qb;
+   cout << " Test qa==qb : -> " << qa << " ?== " << qb;
    if (qa == qb)  cout << " -> true " << endl;
    else cout << " -> false " << endl;
    qb = q3;
-   cout " Test qa==qb : -> " << qa << " ?== " << qb;
+   cout << " Test qa==qb : -> " << qa << " ?== " << qb;
    if (qa == qb)  cout << " -> true " << endl;
    else cout << " -> false " << endl;