From 0f645836f193e75c4c3b718369e6fab15b5d19c5 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 11 Feb 2015 03:41:03 +0000
Subject: [PATCH] Detection is back, baby\!

---
 src/utils.c |   99 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/src/utils.c b/src/utils.c
index 365faeb..bf02ff3 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -2,10 +2,26 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <unistd.h>
 #include <float.h>
+#include <limits.h>
 
 #include "utils.h"
 
+void pm(int M, int N, float *A)
+{
+    int i,j;
+    for(i =0 ; i < M; ++i){
+        printf("%d ", i+1);
+        for(j = 0; j < N; ++j){
+            printf("%10.6f, ", A[i*N+j]);
+        }
+        printf("\n");
+    }
+    printf("\n");
+}
+
+
 char *find_replace(char *str, char *orig, char *rep)
 {
     static char buffer[4096];
@@ -43,10 +59,9 @@
     }
 }
 
-void error(char *s)
+void error(const char *s)
 {
     perror(s);
-    //fprintf(stderr, "Error: %s\n", s);
     exit(0);
 }
 
@@ -64,8 +79,8 @@
 
 list *split_str(char *s, char delim)
 {
-    int i;
-    int len = strlen(s);
+    size_t i;
+    size_t len = strlen(s);
     list *l = make_list();
     list_insert(l, s);
     for(i = 0; i < len; ++i){
@@ -79,9 +94,9 @@
 
 void strip(char *s)
 {
-    int i;
-    int len = strlen(s);
-    int offset = 0;
+    size_t i;
+    size_t len = strlen(s);
+    size_t offset = 0;
     for(i = 0; i < len; ++i){
         char c = s[i];
         if(c==' '||c=='\t'||c=='\n') ++offset;
@@ -92,9 +107,9 @@
 
 void strip_char(char *s, char bad)
 {
-    int i;
-    int len = strlen(s);
-    int offset = 0;
+    size_t i;
+    size_t len = strlen(s);
+    size_t offset = 0;
     for(i = 0; i < len; ++i){
         char c = s[i];
         if(c==bad) ++offset;
@@ -106,30 +121,55 @@
 char *fgetl(FILE *fp)
 {
     if(feof(fp)) return 0;
-    unsigned long size = 512;
+    size_t size = 512;
     char *line = malloc(size*sizeof(char));
     if(!fgets(line, size, fp)){
         free(line);
         return 0;
     }
 
-    int curr = strlen(line);
+    size_t curr = strlen(line);
 
-    while(line[curr-1]!='\n'){
-        size *= 2;
-        line = realloc(line, size*sizeof(char));
-        if(!line) {
-            printf("%ld\n", size);
-            malloc_error();
+    while((line[curr-1] != '\n') && !feof(fp)){
+        if(curr == size-1){
+            size *= 2;
+            line = realloc(line, size*sizeof(char));
+            if(!line) {
+                printf("%ld\n", size);
+                malloc_error();
+            }
         }
-        fgets(&line[curr], size-curr, fp);
+        size_t readsize = size-curr;
+        if(readsize > INT_MAX) readsize = INT_MAX-1;
+        fgets(&line[curr], readsize, fp);
         curr = strlen(line);
     }
-    line[curr-1] = '\0';
+    if(line[curr-1] == '\n') line[curr-1] = '\0';
 
     return line;
 }
 
+void read_all(int fd, char *buffer, size_t bytes)
+{
+    size_t n = 0;
+    while(n < bytes){
+        int next = read(fd, buffer + n, bytes-n);
+        if(next <= 0) error("read failed");
+        n += next;
+    }
+}
+
+void write_all(int fd, char *buffer, size_t bytes)
+{
+    size_t n = 0;
+    while(n < bytes){
+        size_t next = write(fd, buffer + n, bytes-n);
+        if(next <= 0) error("write failed");
+        n += next;
+    }
+}
+
+
 char *copy_string(char *s)
 {
     char *copy = malloc(strlen(s)+1);
@@ -216,6 +256,14 @@
     return a;
 }
 
+float mse_array(float *a, int n)
+{
+    int i;
+    float sum = 0;
+    for(i = 0; i < n; ++i) sum += a[i]*a[i];
+    return sqrt(sum/n);
+}
+
 void normalize_array(float *a, int n)
 {
     int i;
@@ -236,6 +284,16 @@
     }
 }
 
+float mag_array(float *a, int n)
+{
+    int i;
+    float sum = 0;
+    for(i = 0; i < n; ++i){
+        sum += a[i]*a[i];   
+    }
+    return sqrt(sum);
+}
+
 void scale_array(float *a, int n, float s)
 {
     int i;
@@ -243,6 +301,7 @@
         a[i] *= s;
     }
 }
+
 int max_index(float *a, int n)
 {
     if(n <= 0) return -1;

--
Gitblit v1.10.0