Changeset 1697c40 for doc/theses/jiada_liang_MMath/planet.cfa

Timestamp:

Aug 4, 2024, 11:47:20 AM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

065de93

Parents:

b797fe36

Message:

merge local changes

File:

• doc/theses/jiada_liang_MMath/planet.cfa (modified) (1 diff)

doc/theses/jiada_liang_MMath/planet.cfa

@@ -33 +33 @@
         double earthMass = earthWeight / surfaceGravity( EARTH );
 
-        Planet p = fromInt( prng( __count_e__( Planet ) ) ); // select a random orbiting body
+        Planet p = fromInt( prng( countof( Planet ) ) ); // select a random orbiting body
 //      Planet p = fromInt( prng( 9 ) ); // select a random orbiting body
         choose( p ) {
           case MERCURY, VENUS, EARTH, MARS:
-                sout | labelE( p ) | "is a rocky planet";
+                sout | label( p ) | "is a rocky planet";
           case JUPITER, SATURN, URANUS, NEPTUNE:
-                sout | labelE( p ) | "is a gas-giant planet";
+                sout | label( p ) | "is a gas-giant planet";
           default:
-                sout | labelE( p ) | "is not a planet";
+                sout | label( p ) | "is not a planet";
         }
 
 
-        for ( p; enum Planet ) {
+        for ( p; Planet ) {
                 sout | "Your weight on "
-                 | (p == MOON ? "the" : "") | labelE(p)
+                 | (p == MOON ? "the" : "") | label(p)
                          | "is" | wd( 1,1, surfaceWeight( p, earthMass ) ) | "kg";
         }