Move img unification to module

Author: RMorales25

modules/unification/unification_pv_model.cpp

@@ -15,15 +15,15 @@
 SC_MODULE (unification_module) {
 
   //-----------Internal variables-------------------
-  int x, y;
-  int *magnitude;
+  unsigned char x, y;
+  unsigned char *magnitude;
 
   //-----------Constructor-------------------
   SC_CTOR(unification_module) {
   } // End of Constructor
 
   //------------Code Starts Here-------------------------
-  void unificate(int x, int y, int* magnitude) {
+  void unificate(unsigned char x, unsigned char y, unsigned char* magnitude) {
     this->x = x;
     this->y = y;
     this->magnitude = magnitude;
@@ -34,6 +34,20 @@ SC_MODULE (unification_module) {
     //Values are 1byte -> 0 to 255
     *(this->magnitude) = min(255,*(this->magnitude));
   }
+
+  void unificate_img(unsigned char *img_x, unsigned char *img_y, unsigned char *img_unificated, int img_size, int channels){
+    //Iterate over image
+    for(unsigned char *x = img_x, *y = img_y, *u = img_unificated; x < img_x + img_size, y < img_y + img_size, u< img_unificated + img_size; x+=channels, y+=channels, u+=channels){
+      unsigned char pixel_magnitude;
+      unsigned char pixel_x = *x;
+      unsigned char pixel_y = *y;
+      //printf("Operands: Pixel #%0d -> pixel_x = %0d, pixel_y = %0d\n",int(x-img_x), pixel_x, pixel_y);
+        
+      this->unificate(pixel_x, pixel_y, &pixel_magnitude);
+        //printf("RESULT: pixel_magnitude = %d\n", pixel_magnitude);
+      *u = pixel_magnitude;
+    }
+  }
 
   int norm(int a, int b) {
     int norm_result = 0;

modules/unification/unification_tb.cpp

@@ -52,15 +52,7 @@ int sc_main (int argc, char* argv[]) {
   printf("Combined X and Y images...\n");
 
   //Iterate over image
-  for(unsigned char *x = img_x, *y = img_y, *u = img_unificated; x < img_x + pixel_count, y < img_y + pixel_count, u< img_unificated + pixel_count; x+=channels, y+=channels, u+=channels){
-	  pixel_x = *x;
-	  pixel_y = *y;
-	  //printf("Operands: Pixel #%0d -> pixel_x = %0d, pixel_y = %0d\n",int(x-img_x), pixel_x, pixel_y);
-  	  
-	  unification_U1.unificate(pixel_x, pixel_y, &pixel_magnitude);
-  	  //printf("RESULT: pixel_magnitude = %d\n", pixel_magnitude);
-	  *u = pixel_magnitude;
-  }
+  unification_U1.unificate_img(img_x, img_y, img_unificated, pixel_count, channels);
   printf("Unification finished.\n");
   //FIXME: Add comparison with reference combined image, and time measurement