Changeset 2a301ff for tests/PRNG.cfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• tests/PRNG.cfa (modified) (10 diffs)

tests/PRNG.cfa

@@ -10 +10 @@
 // Created On       : Wed Dec 29 09:38:12 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 25 15:39:52 2023
-// Update Count     : 422
+// Last Modified On : Mon Aug 14 08:49:53 2023
+// Update Count     : 425
 // 
 
@@ -27 +27 @@
 #define str(s) #s
 
-#if defined( __x86_64__ ) || defined( __aarch64__ )             // 64-bit architecture
-#define PRNG PRNG64
-#else                                                                                                   // 32-bit architecture
-#define PRNG PRNG32
-#endif // __x86_64__
-
 //#define TIME
 
@@ -144 +138 @@
         srand( rseed );
 
-        sout | sepDisable;
+        sout | sepOff;
         sout | nl | wd(26, "rand()" ) | wd(12, "rand(5)") | wd(12, "rand(0,5)" );
         for ( 20 ) {
@@ -151 +145 @@
                 sout | wd(12, rand() % (5 - 0 + 1) + 0);
         } // for
-        sout | sepEnable;
+        sout | sepOn;
         sout | "seed" | rseed;
 
@@ -185 +179 @@
         if ( seed != 0 ) set_seed( prng, seed );
 
-        sout | sepDisable;
+        sout | sepOff;
         sout | nl | wd(26, "PRNG()" ) | wd(12, "PRNG(5)") | wd(12, "PRNG(0,5)" );
         for ( 20 ) {
@@ -192 +186 @@
                 sout | wd(12, prng( prng, 0, 5 ));
         } // for
-        sout | sepEnable;
+        sout | sepOn;
         sout | "seed" | get_seed( prng );
 
@@ -220 +214 @@
         if ( seed != 0 ) set_seed( seed );
 
-        sout | sepDisable;
+        sout | sepOff;
         sout | nl | wd(26, "prng()" ) | wd(12, "prng(5)") | wd(12, "prng(0,5)" );
         for ( 20 ) {
@@ -227 +221 @@
                 sout | wd(12, prng( 0, 5 ));
         } // for
-        sout | sepEnable;
+        sout | sepOn;
         sout | "seed" | get_seed( prng );
 
@@ -256 +250 @@
         thread$ & th = *active_thread();
 
-        sout | sepDisable;
+        sout | sepOff;
         sout | nl | wd(26, "prng(t)" ) | wd(12, "prng(t,5)") | wd(12, "prng(t,0,5)" );
         for ( 20 ) {
@@ -263 +257 @@
                 sout | wd(12, prng( th, 0, 5 ));
         } // for
-        sout | sepEnable;
+        sout | sepOn;
         sout | "seed" | get_seed( prng );