Changeset 805 for soft/giet_vm/applications/rosenfeld/nrc2/src

Timestamp:

Mar 15, 2016, 6:35:28 PM (9 years ago)

Author:

meunier

Message:

• Adding the parallel version of rosenfeld

Location:

soft/giet_vm/applications/rosenfeld/nrc2/src

Files:

• nrio1.c (modified) (1 diff)
• nrio2.c (modified) (5 diffs)
• nrset1.c (modified) (1 diff)

soft/giet_vm/applications/rosenfeld/nrc2/src/nrio1.c

@@ -323 +323 @@
   for(i=nl; i<=nh; i++) {
     printf(format, i);
-  }
-  printf("\n");
-
-  for(i=nl; i<=nh; i++) {
-    printf(format, v[i]);
+    printf(" ");
+  }
+  printf("\n");
+
+  for(i=nl; i<=nh; i++) {
+    printf(format, v[i]);
+    printf(" ");
   }
   printf("\n");

soft/giet_vm/applications/rosenfeld/nrc2/src/nrio2.c

@@ -734 +734 @@
     int i, j;
     
+    char * format;
+    char * str;
+    
+    select_display_positive_parameters(iformat, &format, &str);
+    
+    if (name != NULL) {
+        printf("%s\n", name);
+    }
+    
+    // @QM have to hack this function for the giet
+    for (i = i0; i <= i1; i++) {
+        for (j = j0; j <= j1; j++) {
+            if (m[i][j]) {
+                // For the giet
+                int a = m[i][j];
+                int len = 0;
+                if (a == 0) {
+                    len = 1;
+                }
+                else {
+                    while (a != 0) {
+                        a = a / 10;
+                        len++;
+                    }
+                }
+                for (int k = len; k < iformat; k++) {
+                    printf(" ");
+                }
+                printf("%d", m[i][j]);
+            }
+            else {
+                printf("%s", str);
+            }
+        }
+        printf("\n");
+    }    
+}
+
+
+// --------------------------------------------------------------------------------------------------
+void display_si16matrix_positive(sint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+// --------------------------------------------------------------------------------------------------
+{
+    int i, j;
+    
     char *format, *str;
     
@@ -752 +797 @@
 }
 // --------------------------------------------------------------------------------------------------
-void display_si16matrix_positive(sint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+void display_ui16matrix_positive(uint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
 // --------------------------------------------------------------------------------------------------
 {
     int i, j;
-    
     char *format, *str;
     
@@ -775 +819 @@
 }
 // --------------------------------------------------------------------------------------------------
-void display_ui16matrix_positive(uint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+void display_si32matrix_positive(sint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
 // --------------------------------------------------------------------------------------------------
 {
@@ -797 +841 @@
 }
 // --------------------------------------------------------------------------------------------------
-void display_si32matrix_positive(sint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+void display_ui32matrix_positive(uint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
 // --------------------------------------------------------------------------------------------------
 {
     int i, j;
-    char *format, *str;
+    char * format;
+    char * str;
     
     select_display_positive_parameters(iformat, &format, &str);
     
-    if(name != NULL) printf(name);
-    
-    for(i=i0; i<=i1; i++) {
-        for(j=j0; j<=j1; j++) {
-            if(m[i][j]) {
-                printf(format, m[i][j]);
-            } else {
+    if (name != NULL) {
+        printf("%s\n", name);
+    }
+    
+    // @QM have to hack this function for the giet
+    for (i = i0; i <= i1; i++) {
+        for (j = j0; j <= j1; j++) {
+            if (m[i][j] != 0) {
+                int a = m[i][j];
+                int len = 0;
+                if (a == 0) {
+                    len = 1;
+                }
+                else {
+                    while (a != 0) {
+                        a = a / 10;
+                        len++;
+                    }
+                }
+                for (int k = len; k < iformat; k++) {
+                    printf(" ");
+                }
+                printf("%d", m[i][j]);
+            }
+            else {
                 printf("%s", str);
             }
@@ -817 +880 @@
         printf("\n");
     }    
-}
-// --------------------------------------------------------------------------------------------------
-void display_ui32matrix_positive(uint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
-// --------------------------------------------------------------------------------------------------
-{
-    int i, j;
-    char *format, *str;
-    
-    select_display_positive_parameters(iformat, &format, &str);
-    
-    if(name != NULL) printf(name);
-    
-    for(i=i0; i<=i1; i++) {
-        for(j=j0; j<=j1; j++) {
-            if(m[i][j]) {
-                printf(format, m[i][j]);
-            } else {
-                printf("%s", str);
-            }
-        }
-        printf("\n");
-    }    
+
 }
 // --------------------------------------------------------------------------------------------------

soft/giet_vm/applications/rosenfeld/nrc2/src/nrset1.c

@@ -497 +497 @@
 /* --------------------------------------------------------------------- */
 {
-        int i;
-        char c[1];
-        for(i=nl; i<=nh; i++) {
-
-                *c = *str++;
-                if(isdigit(*c))
+    // @QM
+        int i;
+        char c[2];
+    c[1] = '\0';
+        for (i = nl; i <= nh; i++) {
+                c[0] = *str++;
+                if (isdigit(c[0])) {
                         v[i] = (uint8) atoi(c);
-                else
+        }
+                else {
                         v[i] = (uint8) 0;
+        }
         }
 }