Changes in src/examples/sum.c [097e2b0:6e7e2b36]

File:

• src/examples/sum.c (modified) (2 diffs)

src/examples/sum.c

@@ -7 +7 @@
 // sum.c -- 
 //
-// Author           : Peter A. Buhr
+// Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep 28 15:09:55 2015
-// Update Count     : 118
+// Last Modified On : Mon Jun  1 20:46:35 2015
+// Update Count     : 18
 //
 
 extern "C" {
-        int printf( char *, ... );
+        int printf( const char *, ... );
 }
-#include "fstream.h"
 
 context sumable( type T ) {
         const T 0;
         T ?+?( T, T );
+        T ?++( T * );
         T ?+=?( T *, T );
-        T ++?( T * );
-        T ?++( T * );
 };
 
 forall( type T | sumable( T ) )
-T sum( unsigned int n, T a[] ) {
-        T total = 0;                                                                            // instantiate T, select 0
-        for ( unsigned int i = 0; i < n; i += 1 )
-                total += a[i];                                                                  // select +
+T sum( int n, T a[] ) {
+        T total;                                                                                        // instantiate T, select 0
+        total = 0;
+        for ( int i = 0; i < n; i += 1 )
+                total = total + a[i];                                                   // select +
         return total;
 }
@@ -37 +36 @@
 // Required to satisfy sumable as char does not have addition.
 const char 0;
-char ?+?( char op1, char op2 ) { return (int)op1 + op2; } // cast forces integer addition or recursion
-char ++?( char *op ) { *op += 1; return *op; }
-char ?++( char *op ) { char temp = *op; *op += 1; return temp; }
+char ?+?( char op1, char op2 ) { return op1 + op2; }
+char ?++( char *op ) { return *op + 1; }
+
+const double 0; // TEMPORARY, incorrect use of int 0
 
 int main() {
         const int low = 5, High = 15, size = High - low;
-
-        ofstream *sout = ofstream_stdout();
-
-        char s = 0, a[size];
-        char v = low;
-        for ( int i = 0; i < size; i += 1, v += 1 ) {
-                s += v;
-                a[i] = v;
-        }
-        sout << "sum from " << low << " to " << High << " is "
-                 << (int)sum( size, a ) << ", check " << (int)s << "\n";
-
-        int s = 0, a[size];
+        int si = 0, ai[size];
         int v = low;
         for ( int i = 0; i < size; i += 1, v += 1 ) {
-                s += (int)v;
-                a[i] = (int)v;
+                si += v;
+                ai[i] = v;
         }
-        sout << "sum from " << low << " to " << High << " is "
-                 << sum( size, (int *)a ) << ", check " << (int)s << "\n";
+        printf( "sum from %d to %d is %d, check %d\n",
+                        low, High, sum( size, ai ), si );
 
-        double s = 0.0, a[size];
+//      char ci[size];
+//      char c = sum( size, ci );
+//      float fi[size];
+//      float f = sum( size, fi );
+
+        double sd = 0.0, ad[size];
         double v = low / 10.0;
         for ( int i = 0; i < size; i += 1, v += 0.1 ) {
-                s += (double)v;
-                a[i] = (double)v;
+                sd += v;
+                ad[i] = v;
         }
-        printf( "%g\n", sum( size, (double *)a ) );
-//      sout << "sum from " << low / 10.0 << " to " << High / 10.0 << " is "
-//               << sum( size, (double *)a ) << ", check " << (double)s << "\n";
-
-        float s = 0.0, a[size];
-        float v = low / 10.0;
-        for ( int i = 0; i < size; i += 1, v += 0.1f ) {
-                s += (float)v;
-                a[i] = (float)v;
-        }
-        printf( "%g\n", sum( size, (float *)a ) );
-//      sout << "sum from " << low / 10.0 << " to " << High / 10.0 << " is "
-//               << sum( size, (float *)a ) << ", check " << (float)s << "\n";
+        printf( "sum from %g to %g is %g, check %g\n",
+                        low / 10.0, High / 10.0, sum( size, ad ), sd );
 }
 
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa sum.c fstream.o iostream.o" //
+// compile-command: "cfa sum.c" //
 // End: //