Reformating files structure to match other modules format

Author: RMorales25

modules/unification/include/unification_pv_model.hpp

@@ -0,0 +1,33 @@
+//-----------------------------------------------------
+//Module: Image Unification (PV) Header
+//By: Roger Morales Monge
+//Description: Programmer's View Model of unification
+//process for two images (magnitude)
+//-----------------------------------------------------
+
+#ifdef IMG_UNIFICATE_PV_EN
+#ifndef IMG_UNIFICATE_HPP
+#define IMG_UNIFICATE_HPP
+
+#include "systemc.h"
+#include "math.h"
+
+SC_MODULE (img_unification_module) {
+
+  //-----------Internal Variables-----------
+  unsigned char x_pixel, y_pixel;
+  unsigned char *unificated_pixel;
+  
+  //-----------Constructor-----------
+  SC_CTOR(img_unification_module) {
+  } // End of Constructor
+
+  //------------Methods------------
+  void unificate_pixel(unsigned char x_pixel, unsigned char y_pixel, unsigned char * unificated_pixel);
+  void unificate_img(unsigned char *x_img, unsigned char *y_img, unsigned char *unificated_img, int img_size, int channels);
+  int norm(int a, int b);
+};
+
+#endif //IMG_UNIFICATE_HPP
+#endif //IMG_UNIFICATE_PV_EN
+

modules/unification/src/unification_pv_model.cpp

@@ -0,0 +1,58 @@
+//-----------------------------------------------------
+//Module: Unification (PV)
+//By: Roger Morales Monge
+//Description: Programmer's View Model of unification
+//process for two images (magnitude)
+//-----------------------------------------------------
+#ifdef IMG_UNIFICATE_PV_EN
+#ifndef IMG_UNIFICATE_CPP
+#define IMG_UNIFICATE_CPP
+
+#include "unification_pv_model.hpp"
+
+//-----------NORM SELECTION MACROS-----------
+//#define USE_L1_NORM
+#define USE_L2_NORM //default
+//#define USE_INF_NORM
+//-------------------------------------------
+
+void img_unification_module::unificate_pixel(unsigned char x_pixel, unsigned char y_pixel, unsigned char * unificated_pixel) {
+  //Get the Norm
+  *unificated_pixel = (unsigned char) this->norm(x_pixel, y_pixel);
+}
+
+void img_unification_module::unificate_img(unsigned char *x_img, unsigned char *y_img, unsigned char *unificated_img, int img_size, int channels){
+  //Iterate over image
+  for(unsigned char *x = x_img, *y = y_img, *u = unificated_img; x < x_img + img_size && y < y_img + img_size && u < unificated_img + img_size; x+=channels, y+=channels, u+=channels){
+    unsigned char pixel_magnitude;
+    unsigned char pixel_x = int(*x);
+    unsigned char pixel_y = int(*y);
+      
+    this->unificate_pixel(pixel_x, pixel_y, &pixel_magnitude);
+    *u = pixel_magnitude;
+  }
+}
+  
+int img_unification_module::norm(int a, int b) {
+  int norm_result = 0;
+    
+  //L1 Norm
+  #ifdef USE_L1_NORM
+  norm_result = abs(a) + abs(b);
+  #endif
+
+  //L2 Norm
+  #ifdef USE_L2_NORM
+  norm_result = sqrt(pow(a, 2) + pow(b, 2));
+  #endif
+  
+  //INFINITY Norm
+  #ifdef USE_INF_NORM
+  norm_result = (a > b ? a : b);
+  #endif
+  
+  return norm_result;
+}
+
+#endif //IMG_UNIFICATE_CPP
+#endif //IMG_UNIFICATE_PV_EN

modules/unification/unification_tb.cpp …dules/unification/src/unification_tb.cppmodules/unification/unification_tb.cpp renamed to modules/unification/src/unification_tb.cpp modules/unification/unification_tb.cpp renamed to modules/unification/src/unification_tb.cpp

@@ -3,20 +3,25 @@
 //By: Roger Morales Monge
 //Description: Simple TB for pixel unification modules
 //--------------------------------------------------------
+
 #include <systemc.h>
+
 #define STB_IMAGE_IMPLEMENTATION
-#include "lib/stb_image.h"
+#include "include/stb_image.h"
 #define STB_IMAGE_WRITE_IMPLEMENTATION
-#include "lib/stb_image_write.h"
-#include "unification_pv_model.cpp"
-//#include "unification_lt_model.cpp"
-//#include "unification_at_model.cpp"
+#include "include/stb_image_write.h"
+
+
+#include "math.h"
 
+#ifdef IMG_UNIFICATE_PV_EN
+#include "unification_pv_model.hpp"
+#endif
 
 int sc_main (int argc, char* argv[]) {
 
-  int pixel_x, pixel_y;
-  int pixel_magnitude;
+  unsigned char pixel_x, pixel_y;
+  unsigned char pixel_magnitude;
   int i;
   int width, height, channels, pixel_count;
   unsigned char *img_x, *img_y, *img_unificated;
@@ -26,7 +31,7 @@ int sc_main (int argc, char* argv[]) {
   int error_count;
   float error_med;
 
-  unification_module unification_U1 ("unification_U1");
+  img_unification_module unification_U1 ("unification_U1");
 
   // Open VCD file
   sc_trace_file *wf = sc_create_vcd_trace_file("unification_U1");