clean up cpp utils

Author: Yusuke Sugomori

cpp/DBN.cpp

@@ -1,33 +1,12 @@
 #include <iostream>
 #include <math.h>
+#include "utils.h"
 #include "HiddenLayer.h"
 #include "RBM.h"
 #include "LogisticRegression.h"
 #include "DBN.h"
 using namespace std;
-
-
-double uniform(double min, double max) {
-  return rand() / (RAND_MAX + 1.0) * (max - min) + min;
-}
-
-int binomial(int n, double p) {
-  if(p < 0 || p > 1) return 0;
-  
-  int c = 0;
-  double r;
-  
-  for(int i=0; i<n; i++) {
-    r = rand() / (RAND_MAX + 1.0);
-    if (r < p) c++;
-  }
-
-  return c;
-}
-
-double sigmoid(double x) {
-  return 1.0 / (1.0 + exp(-x));
-}
+using namespace utils;
 
 
 // DBN

cpp/HiddenLayer.cpp

@@ -1,30 +1,9 @@
 #include <iostream>
 #include <math.h>
 #include "HiddenLayer.h"
+#include "utils.h"
 using namespace std;
-
-double uniform(double min, double max) {
-  return rand() / (RAND_MAX + 1.0) * (max - min) + min;
-}
-
-int binomial(int n, double p) {
-  if(p < 0 || p > 1) return 0;
-  
-  int c = 0;
-  double r;
-  
-  for(int i=0; i<n; i++) {
-    r = rand() / (RAND_MAX + 1.0);
-    if (r < p) c++;
-  }
-
-  return c;
-}
-
-double sigmoid(double x) {
-  return 1.0 / (1.0 + exp(-x));
-}
-
+using namespace utils;
 
 
 HiddenLayer::HiddenLayer(int size, int in, int out, double **w, double *bp) {

cpp/RBM.cpp

@@ -1,29 +1,9 @@
 #include <iostream>
 #include <math.h>
+#include "utils.h"
 #include "RBM.h"
 using namespace std;
-
-double uniform(double min, double max) {
-  return rand() / (RAND_MAX + 1.0) * (max - min) + min;
-}
-
-int binomial(int n, double p) {
-  if(p < 0 || p > 1) return 0;
-  
-  int c = 0;
-  double r;
-  
-  for(int i=0; i<n; i++) {
-    r = rand() / (RAND_MAX + 1.0);
-    if (r < p) c++;
-  }
-
-  return c;
-}
-
-double sigmoid(double x) {
-  return 1.0 / (1.0 + exp(-x));
-}
+using namespace utils;
 
 
 RBM::RBM(int size, int n_v, int n_h, double **w, double *hb, double *vb) {

cpp/SdA.cpp

@@ -1,32 +1,13 @@
 #include <iostream>
 #include <math.h>
+#include "utils.h"
+
 #include "HiddenLayer.h"
 #include "dA.h"
 #include "LogisticRegression.h"
 #include "SdA.h"
 using namespace std;
-
-double uniform(double min, double max) {
-  return rand() / (RAND_MAX + 1.0) * (max - min) + min;
-}
-
-int binomial(int n, double p) {
-  if(p < 0 || p > 1) return 0;
-  
-  int c = 0;
-  double r;
-  
-  for(int i=0; i<n; i++) {
-    r = rand() / (RAND_MAX + 1.0);
-    if (r < p) c++;
-  }
-
-  return c;
-}
-
-double sigmoid(double x) {
-  return 1.0 / (1.0 + exp(-x));
-}
+using namespace utils;
 
 
 // SdA

cpp/dA.cpp

@@ -1,30 +1,10 @@
 #include <iostream>
 #include <math.h>
+#include "utils.h"
+
 #include "dA.h"
 using namespace std;
-
-
-double uniform(double min, double max) {
-  return rand() / (RAND_MAX + 1.0) * (max - min) + min;
-}
-
-int binomial(int n, double p) {
-  if(p < 0 || p > 1) return 0;
-  
-  int c = 0;
-  double r;
-  
-  for(int i=0; i<n; i++) {
-    r = rand() / (RAND_MAX + 1.0);
-    if (r < p) c++;
-  }
-
-  return c;
-}
-
-double sigmoid(double x) {
-  return 1.0 / (1.0 + exp(-x));
-}
+using namespace utils;
 
 
 dA::dA(int size, int n_v, int n_h, double **w, double *hb, double *vb) {

cpp/utils.cpp

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <iostream>
+#include <math.h>
+using namespace std;
+
+
+namespace utils {
+  
+  double uniform(double min, double max) {
+    return rand() / (RAND_MAX + 1.0) * (max - min) + min;
+  }
+
+  int binomial(int n, double p) {
+    if(p < 0 || p > 1) return 0;
+  
+    int c = 0;
+    double r;
+  
+    for(int i=0; i<n; i++) {
+      r = rand() / (RAND_MAX + 1.0);
+      if (r < p) c++;
+    }
+
+    return c;
+  }
+
+  double sigmoid(double x) {
+    return 1.0 / (1.0 + exp(-x));
+  }
+
+}