Changeset caa3e2c for doc/theses/mike_brooks_MMath/programs/hello-accordion.cfa

Timestamp:

Jul 29, 2024, 9:49:07 AM (5 weeks ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

b67d7a5b

Parents:

b8e047a

Message:

proofread array chapter and update example programs

File:

• doc/theses/mike_brooks_MMath/programs/hello-accordion.cfa (modified) (5 diffs)

doc/theses/mike_brooks_MMath/programs/hello-accordion.cfa

@@ -9 +9 @@
 
 forall( T, @[NprovTerty]@, @[Nmunicipalities]@ )
-struct CanadaPop {
+struct CanPop {
         array( T, @NprovTerty@ ) provTerty; $\C{// nested VLA}$
         array( T, @Nmunicipalities@ ) municipalities; $\C{// nested VLA}$
@@ -19 +19 @@
 
 forall( T, [NprovTerty], [Nmunicipalities] )
-        void ?{}( T &, CanadaPop( T, NprovTerty, Nmunicipalities ) & this ) {}
+        void ?{}( T &, CanPop( T, NprovTerty, Nmunicipalities ) & this ) {}
 
 forall( T &, [NprovTerty], [Nmunicipalities] )
-        void ^?{}( CanadaPop( T, NprovTerty, Nmunicipalities ) & this ) {}
+        void ^?{}( CanPop( T, NprovTerty, Nmunicipalities ) & this ) {}
 
 
@@ -39 +39 @@
 
 forall( T, [NprovTerty], [Nmunicipalities] )
-void check( CanadaPop( T, NprovTerty, Nmunicipalities ) & pop ) with( pop ) {
+void check( CanPop( T, NprovTerty, Nmunicipalities ) & pop ) with( pop ) {
         total_pt = total_mun = 0;
         for ( i; NprovTerty ) total_pt += provTerty[i];
@@ -60 +60 @@
 int main( int argc, char * argv[] ) {
         const int npt = ato( argv[1] ), nmun = ato( argv[2] );
-        @CanadaPop( int, npt, nmun ) pop;@
+        @CanPop( int, npt, nmun ) pop;@
         // read in population numbers
         @check( pop );@
@@ -71 +71 @@
 Total province/territory: 36,991,981
 Total municipalities: 36,991,981
+$\$$ ./a.out  13  3654
+Total province/territory: 36,991,981
+Total municipalities: 36,991,981
 */