Diff: main.cpp

Revision:

1:3df59f65bdcc

Parent:

0:90a30b7b0f2f

Child:

3:2649800966bb

--- a/main.cpp	Sun May 22 06:17:14 2016 +0000
+++ b/main.cpp	Mon Jul 25 13:37:41 2016 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------------
 //  Demo program for Array class and Matrix class
 //
-//  2016/05/22, Copyright (c) 2016 MIKAMI, Naoki
+//  2016/07/25, Copyright (c) 2016 MIKAMI, Naoki
 //------------------------------------------------------------
 
 #define DEBUG_ARRAY_CHECK   // Range check of index available
@@ -17,13 +17,12 @@
 
 int main()
 {
-    printf("\r\n14:58\r\n");
 
     // Test of Array class
     Array<int> sn(10);
     sn[9] = 0;
     
-////    Array<uint8_t> a1(100000);  // Size error
+//    Array<uint8_t> a1(100000);  // Size error
     Array<uint8_t> a1(10000);
     printf("OK\r\n");
     
@@ -38,8 +37,10 @@
         printf("%8.4f, %8.4f, %8.4f\r\n", x1[n], x2[n], x3[n]);
     printf("\r\n");
     
-    Array<string> str(5, "abc");
-    for (int n=0; n<str.Length(); n++) printf("%s\r\n", str[n].c_str());
+    // Initialized by built-in array
+    Array<int> xInt(5, (int[]){ 4, 1, -3, 9, -5});
+    for (int n=0; n<xInt.Length(); n++)
+        printf("xInt[%d] = %d\r\n", n, xInt[n]);
     
     // Test of Matrix class
     Matrix<int> mat1(3, 2), mat2;
@@ -75,3 +76,4 @@
         printf("\r\n");
     }
 }
+