Changeset 8614140 for doc/theses/mike_brooks_MMath/programs

Timestamp:

Jan 8, 2026, 1:26:42 PM (8 weeks ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master, stuck-waitfor-destruct

Children:

fb7c9168

Parents:

79ba50c (diff), 4904b05 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

doc/theses/mike_brooks_MMath/programs

Files:

• ar-bchk/Makefile (added)
• ar-bchk/control.c (added)
• ar-bchk/control.cc (added)
• ar-bchk/control.cfa (added)
• ar-bchk/treatment.c (added)
• ar-bchk/treatment.cc (added)
• ar-bchk/treatment.cfa (added)
• array-boundcheck-removal-matmul.cfa (deleted)
• array-boundcheck-removal-stdvec.cpp (deleted)
• array-boundcheck-removal.cfa (deleted)
• hello-accordion.cfa (modified) (2 diffs)
• hello-array.cfa (modified) (3 diffs)
• school1 (modified) (1 diff)
• school1.out (modified) (1 diff)
• school2 (modified) (1 diff)
• school2.out (modified) (1 diff)
• sharing-demo.cfa (modified) (1 diff)

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

@@ -31 +31 @@
 int getPref( @School( C, S ) & school@, int is, int pref ) {
         for ( ic; C ) {
-                if ( pref == @school.preferences@[ic][is]; ) return ic; $\C{// offset calculation implicit}$
+                if ( pref == @school.preferences@[ic][is] ) return ic; $\C{// offset calculation implicit}$
         }
-        assert( false );
+        assert( false );        // must find a match
 }
 
@@ -89 +89 @@
 
         for ( is; ns ) {
-                sout | school.student_ids[is] | ": " | nonl;
+                sout | school.student_ids[is] | ": ";
                 for ( pref; 1 ~= nc ) {
                         int ic = getPref( school, is, pref );

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

@@ -89 +89 @@
 
 forall( [M], [N] )
-void bad( array(float, M) &x,
-                array(float, N) &y ) {
+void f( array(float, M) &x, array(float, N) &y ) {
         f( x, x );              $\C[0.5in]{// ok}$
         f( y, y );              $\C{// ok}$
-
         f( x, y );              $\C{// error}\CRT$
+        if ( M == N ) f( x, @(array( float, M ) &)@y ); $\C{// ok}\CRT$
 }
-
 #endif
 
@@ -109 +107 @@
 
 forall( [M], [N] )
-void bad_fixed( array( float, M ) & x,
-                array( float, N ) & y ) {
+void f( array( float, M ) & x, array( float, N ) & y ) {
         f( x, x );              $\C[0.5in]{// ok}$
         f( y, y );              $\C{// ok}$
-        if ( M == N )
-                f( x, @(array( float, M ) &)@y ); $\C{// ok}\CRT$
+        if ( M == N ) f( x, @(array( float, M ) &)@y ); $\C{// ok}\CRT$
 }
 
@@ -132 +128 @@
 
 forall( [M], [N] )
-void bad_ok_only( array(float, M) &x,
-                array(float, N) &y ) {
+void bad_ok_only( array(float, M) &x, array(float, N) &y ) {
         f( x, x );
         f( y, y );

doc/theses/mike_brooks_MMath/programs/school1

@@ -1 +1 @@
 3 courses, 2 students
-c\s     90111111 90222222
-ENGL101        3        2
-PHYS101        1        3
-CHEM101        2        1
+c\s              90111111 90222222
+ENGL101                 3               2
+PHYS101                 1               3
+CHEM101                2               1

doc/theses/mike_brooks_MMath/programs/school1.out

@@ -1 @@
-90111111: PHYS101 CHEM101 ENGL101
-90222222: CHEM101 ENGL101 PHYS101
+90111111: 
+PHYS101 CHEM101 ENGL101
+90222222: 
+CHEM101 ENGL101 PHYS101

doc/theses/mike_brooks_MMath/programs/school2

@@ -1 +1 @@
 5 courses, 3 students
-c\s     90111111 90222222 90333333
-ENGL101        3        2        3
-PHYS101        1        3        4
-CHEM101        2        1        5
-PHIL101        4        5        2
-MATH499        5        4        1
+c\s              90111111 90222222 90333333
+ENGL101                 3               2               3
+PHYS101                 1               3               4
+CHEM101                2               1               5
+PHIL101                   4               5               2
+MATH499                 5               4               1

doc/theses/mike_brooks_MMath/programs/school2.out

@@ -1 @@
-90111111: PHYS101 CHEM101 ENGL101 PHIL101 MATH499
-90222222: CHEM101 ENGL101 PHYS101 MATH499 PHIL101
-90333333: MATH499 PHIL101 ENGL101 PHYS101 CHEM101
+90111111: 
+PHYS101 CHEM101 ENGL101 PHIL101 MATH499
+90222222: 
+CHEM101 ENGL101 PHYS101 MATH499 PHIL101
+90333333: 
+MATH499 PHIL101 ENGL101 PHYS101 CHEM101

doc/theses/mike_brooks_MMath/programs/sharing-demo.cfa

@@ -300 +300 @@
         open( outfile, "build/sharing10.tex" );
         outfile | "\\begin{cquote}";
+        outfile | "\\setlength{\\tabcolsep}{10pt}";
         outfile | "\\begin{tabular}{@{}rlllll@{}}";
         outfile | "\t\t\t\t& @s1@\t& @s1_bgn@\t& @s1_crs@\t& @s1_mid@\t& @s1_end@\t\\\\";