Changeset 7ef4438 for doc/theses/mike_brooks_MMath/programs

Timestamp:

Oct 29, 2024, 12:50:56 PM (5 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

b699a61

Parents:

63cf80e (diff), d0296db6 (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:

• hello-accordion.cfa (modified) (5 diffs)
• hello-array.cfa (modified) (2 diffs)
• school1 (modified) (1 diff)
• school1.out (added)
• school2 (modified) (1 diff)
• school2.out (added)

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

@@ -2 +2 @@
 #include <stdlib.hfa>
 #include <array.hfa>
-#include <locale.h>                                                     // setlocale
+#include <string.hfa>
 
 
@@ -8 +8 @@
 
 
-forall( [C], [S] ) $\C{// Class size, Students in class}$
+forall( [C], [S] ) $\C{// num courses, num students}$
 struct School {
-        @array( int, C )@ classIds; $\C{// nested VLAs}$
-        @array( int, S )@ studentIds;
-        @array( int, C, S )@ preferences; $\C{// multidimensional}$
+        @array@( string, C ) course_codes; $\C{// nested VLAs}$
+        @array@( string, S ) student_ids;
+        @array@( int, C, S ) preferences; $\C{// multidimensional}$
 };
-
-
-
-// TODO: understand (fix?) why these are needed (autogen seems to be failing ... is typeof as struct member nayok?)
-
-forall( [C], [S] )
-void ?{}( School( C, S ) & this ) {}
-
-forall( [C], [S] )
-        void ^?{}( School( C, S ) & this ) {}
 
 
@@ -39 +29 @@
 
 forall( [C], [S] )
-void init( @School( C, S ) & classes@, int class, int student, int pref ) with( classes ) {
-        classIds[class] = class; $\C{// handle dynamic offsets of fields within structure}$
-        studentIds[student] = student;
-        preferences[class][student] = pref;
+int getPref( @School( C, S ) & school@, int is, int pref ) {
+    for ( ic; C ) {
+        int curPref = @school.preferences@[ic][is];   $\C{// offset calculation implicit}$
+                if ( curPref == pref ) return ic;
+        }
+    assert( false );
 }
 
@@ -56 +48 @@
 
 
+int main() {
+        int nc, ns;
+        sin | nc | " courses,";
+        sin | ns | " students";
+        @School( nc, ns ) school;@
+        // ... elided: read data into school
 
 
-int main() {
-        int classes, students;
-        sin | classes | students;
-        @School( classes, students ) school;@
-        int class, student, preference;
-        // read data into school calling init
-        // for each student's class/preferences
-        try {
-                for ( ) {
-                        sin | class | student | preference;
-                        init( school, class, student, preference );
-                }
-        } catch( end_of_file * ) {}
-        for ( s; students ) {
-                sout | "student" | s | nonl;
-                for ( c; classes ) {
-                        sout | school.preferences[c][s] | nonl;
+
+
+        {       string sv;
+        int iv;
+        // headers' row
+        sin | "\nc\\s";
+        for ( is ; ns ) {
+            // column label
+            sin | sv;
+            school.student_ids[is] = sv;
+        }
+        // body rows
+        for ( ic ; nc ) {
+            // row label
+            sin | sv;
+            school.course_codes[ic] = sv;
+            for ( is ; ns ) {
+                // matrix item
+                sin | iv;
+                school.preferences[ic][is] = iv;
+            }
+        }
+    }
+
+
+
+
+
+
+
+
+
+        for ( is; ns ) {
+                sout | school.student_ids[is] | ": " | nonl;
+                for ( pref; 1 ~= nc ) {
+            int ic = getPref(school, is, pref);
+            sout | school.course_codes[ ic ] | nonl;
                 }
                 sout | nl;
@@ -81 +99 @@
 
 
-
-/*
-$\$$ cat school1
-2 2
-0 0 1
-1 0 7
-0 1 12
-1 1 13
-$\$$ a.out < school1
-student 0 1 7
-student 1 12 13
-
-$\$$ cat school2
-3 3
-0 0 1
-1 0 7
-2 0 8
-0 1 12
-1 1 13
-2 1 14
-0 2 26
-1 2 27
-2 2 28
-$\$$ a.out < school2
-student 0 1 7 8
-student 1 12 13 14
-student 2 26 27 28
-*/
-
 // Local Variables: //
 // compile-command: "sed -f sedcmd hello-accordion.cfa > ../build/tmp.cfa; cfa ../build/tmp.cfa -Wall -Wextra" //

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

@@ -49 +49 @@
 */
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+#ifdef SHOWERR1
+
 void fred() {
+
+
+
+        array( float, @10@ ) x;
+        array( float, @20@ ) y;
+        f( x, x );              $\C[0.5in]{// ok}$
+        f( y, y );              $\C{// ok}$
+        f( x, y );              $\C{// error}\CRT$
+
+
+
+
+}
+
+
+
+
+
+
+
+
+
+
+forall( [M], [N] )
+void bad( 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$
+}
+
+#endif
+
+
+
+
+
+
+
+
+
+
+forall( [M], [N] )
+void bad_fixed( 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}$
+}
+
+
+
+
+
+
+void fred_ok_only() {
         array( float, @10@ ) x;
         array( float, @20@ ) y;
@@ -57 +130 @@
 }
 
-#ifdef SHOWERR1
-forall( [M], [N] )
-void bad( array(float, M) &x, array(float, N) &y ) {
-        f( x, x );              $\C[1.5in]{// ok}$
-        f( y, y );              $\C{// ok}$
-        f( x, y );              $\C{// error}\CRT$
-}
-#endif
-
-
 
 forall( [M], [N] )
-void bad_fixed( array( float, M ) & x, array( float, N ) & y ) {
-        if ( M == N )
-                f( x, @(array( float, M ) &)@y ); $\C{// cast y to matching type}$
+void bad_ok_only( array(float, M) &x,
+                array(float, N) &y ) {
+        f( x, x );
+        f( y, y );
+
+//      f( x, y );
 }
+
 
 // Local Variables: //

doc/theses/mike_brooks_MMath/programs/school1 ¶

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

doc/theses/mike_brooks_MMath/programs/school2 ¶

@@ -1 @@
-3 3
-0 0 1
-1 0 7
-2 0 8
-0 1 12
-1 1 13
-2 1 14
-0 2 26
-1 2 27
-2 2 28
+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