Changeset dbff8ec for doc/theses/mike_brooks_MMath/programs/hello-md.cfa

Timestamp:

Jul 10, 2024, 3:39:37 AM (19 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

725f777f

Parents:

bb336a6 (diff), f3811df (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

File:

• doc/theses/mike_brooks_MMath/programs/hello-md.cfa (modified) (6 diffs)

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

@@ -39 +39 @@
 
 forall( [N] )
-void print1d_cstyle( array(float, N) & c );
+void print1d_cstyle( array( float, N ) & r ); $\C{// C style}$
 
-forall( [N], C & | ar( C, float, N ) )
+forall( [N], C & @| ar( C, float, N )@ ) $\C{// add trait}$
 void print1d( C & c );
 
@@ -59 +59 @@
 
 forall( [N] )
-void print1d_cstyle( array(float, N) & c ) {
-        for ( i; N ) {
-                sout | c[i] | nonl;
-        }
+void print1d_cstyle( array( float, N ) & r ) { $\C{// C style}$
+        for ( i; N ) sout | r[i] | nonl;
         sout | nl;
 }
+
+
 
 
@@ -98 +98 @@
 
 
-void fill( array(float, 5, 7) & a ) {
+void fill( array( float, 5, 7 ) & a ) {
         for ( i; (ptrdiff_t) 5 ) {
                 for ( j; 7 ) {
@@ -116 +116 @@
 
 
-array( float, 5, 7 ) a;
-fill(a);
+array( float, 5, 7 ) m;
+fill( m );
 /*
-0.0  0.1  0.2  0.3  0.4  0.5  0.6  
-1.0  1.1  1.2  1.3  1.4  1.5  1.6  
-2.0  2.1  2.2  2.3  2.4  2.5  2.6  
-3.0  3.1  3.2  3.3  3.4  3.5  3.6  
-4.0  4.1  4.2  4.3  4.4  4.5  4.6
+r/c   0     1     2     3     4     5     6
+0  0.0  0.1  0.2  @0.3@  0.4  0.5  0.6  
+1  1.0  1.1  1.2  @1.3@  1.4  1.5  1.6  
+2  @2.0  2.1  2.2  2.3  2.4  2.5  2.6@  
+3  3.0  3.1  3.2  @3.3@  3.4  3.5  3.6  
+4  4.0  4.1  4.2  @4.3@  4.4  4.5  4.6
 */
 
@@ -137 +138 @@
 
 
-
-print1d_cstyle( a[ 2 ] );  // 2.0  2.1  2.2  2.3  2.4  2.5  2.6
+print1d_cstyle( m[ 2 ] );  $\C{// row 2:  2.0  2.1  2.2  2.3  2.4  2.5  2.6}$
 
 
 
 
-print1d( a[ 2 ] );  // 2.0  2.1  2.2  2.3  2.4  2.5  2.6
+print1d( m[ 2 ] );  $\C{// row:  2.0  2.1  2.2  2.3  2.4  2.5  2.6}$
 
 
 
 
-print1d( a[ 2, all ] );  // 2.0  2.1  2.2  2.3  2.4  2.5  2.6
-print1d( a[ all, 3 ] );  // 0.3  1.3  2.3  3.3  4.3
+print1d( m[ 2, all ] );  $\C{// row 2:  2.0  2.1  2.2  2.3  2.4  2.5  2.6}$
+print1d( m[ all, 3 ] );  $\C{// column 3:  0.3  1.3  2.3  3.3  4.3}$
 
 
 
-print1d_cstyle( a[ 2, all ] );
+print1d_cstyle( m[ 2, all ] );
 
 
@@ -163 +163 @@
 #ifdef SHOW_ERROR_1
 
-print1d_cstyle( a[ all, 2 ] );  // bad
+print1d_cstyle( m[ all, 2 ] );  $\C{// bad}$
 
 #endif