Changeset 93d2219 for doc/theses

Timestamp:

Oct 28, 2022, 3:12:16 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, stuck-waitfor-destruct

Children:

fa2e183

Parents:

e874605 (diff), 22a0e87 (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

Files:

• mike_brooks_MMath/programs/hello-md.cfa (modified) (8 diffs)
• thierry_delisle_PhD/thesis/text/front.tex (modified) (1 diff)

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

@@ -1 +1 @@
 #include "array.hfa"
-
-
-trait ix( C &, E &, ztype(N) ) {
-    E & ?[?]( C &, ptrdiff_t );
-    void __taglen( tag(C), tag(N) );
-};
-
-forall( ztype(Zn), ztype(S), Timmed &, Tbase & )
-void __taglen( tag(arpk(Zn, S, Timmed, Tbase)), tag(Zn) ) {}
 
 
@@ -38 +29 @@
 
 
-forall( ztype( N ) )
+
+
+
+
+
+
+
+
+
+forall( [N] )
 void print1d_cstyle( array(float, N) & c );
 
-forall( C &, ztype( N ) | ix( C, float, N ) )
+forall( [N], C & | ar( C, float, N ) )
 void print1d( C & c );
 
@@ -58 +58 @@
 
 
-forall( ztype( N ) )
+forall( [N] )
 void print1d_cstyle( array(float, N) & c ) {
-    for( i; z(N) ) {
+    for( i; N ) {
         printf("%.1f  ", c[i]);
     }
@@ -78 +78 @@
 
 
-forall( C &, ztype( N ) | ix( C, float, N ) )
+forall( [N], C & | ar( C, float, N ) )
 void print1d( C & c ) {
-    for( i; z(N) ) {
+    for( i; N ) {
         printf("%.1f  ", c[i]);
     }
@@ -99 +99 @@
 
 
-void fill( array(float, Z(5), Z(7)) & a ) {
+void fill( array(float, 5, 7) & a ) {
     for ( i; (ptrdiff_t) 5 ) {
         for ( j; 7 ) {
-            a[[i,j]] = 1.0 * i + 0.1 * j;
-            printf("%.1f  ", a[[i,j]]);
+            a[i,j] = 1.0 * i + 0.1 * j;
+            printf("%.1f  ", a[i,j]);
         }
         printf("\n");
@@ -118 +118 @@
 
 
-array( float, Z(5), Z(7) ) a;
+array( float, 5, 7 ) a;
 fill(a);
 /*
@@ -148 +148 @@
 
 
-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( 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_cstyle( a[[ 2, all ]] );
+print1d_cstyle( a[ 2, all ] );
 
 
@@ -161 +161 @@
 
 
-#ifdef SHOWERR1
+#ifdef SHOW_ERROR_1
 
-print1d_cstyle( a[[ all, 2 ]] );  // bad
+print1d_cstyle( a[ all, 2 ] );  // bad
 
 #endif

doc/theses/thierry_delisle_PhD/thesis/text/front.tex

@@ -161 +161 @@
 Thanks to Andrew Beach, Michael Brooks, Colby Parsons, Mubeen Zulfiqar, Fangren Yu and Jiada Liang for their work on the \CFA project as well as all the discussions which have helped me concretize the ideas in this thesis.
 
-Finally, I acknowledge that this has been possible thanks to the financial help offered by the David R. Cheriton School of Computer Science and the corporate partnership with Huawei Ltd.
+Finally, I acknowledge that this has been possible thanks to the financial help offered by the David R. Cheriton School of Computer Science, the corporate partnership with Huawei Ltd. and the Natural Sciences and Engineering Research Council.
 \cleardoublepage