From 726cebd3fb67d65ec6d2d49fa6bfba4c053085df Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Mon, 02 Apr 2018 12:02:53 +0000
Subject: [PATCH] Fixed detector recall
---
src/dice.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/dice.c b/src/dice.c
index 3283fe9..2286459 100644
--- a/src/dice.c
+++ b/src/dice.c
@@ -6,7 +6,6 @@
void train_dice(char *cfgfile, char *weightfile)
{
- data_seed = time(0);
srand(time(0));
float avg_loss = -1;
char *base = basecfg(cfgfile);
@@ -18,7 +17,7 @@
}
printf("Learning Rate: %g, Momentum: %g, Decay: %g\n", net.learning_rate, net.momentum, net.decay);
int imgs = 1024;
- int i = net.seen/imgs;
+ int i = *net.seen/imgs;
char **labels = dice_labels;
list *plist = get_paths("data/dice/dice.train.list");
char **paths = (char **)list_to_array(plist);
@@ -27,15 +26,14 @@
while(1){
++i;
time=clock();
- data train = load_data(paths, imgs, plist->size, labels, 6, net.w, net.h);
+ data train = load_data_old(paths, imgs, plist->size, labels, 6, net.w, net.h);
printf("Loaded: %lf seconds\n", sec(clock()-time));
time=clock();
float loss = train_network(net, train);
- net.seen += imgs;
if(avg_loss == -1) avg_loss = loss;
avg_loss = avg_loss*.9 + loss*.1;
- printf("%d: %f, %f avg, %lf seconds, %d images\n", i, loss, avg_loss, sec(clock()-time), net.seen);
+ printf("%d: %f, %f avg, %lf seconds, %d images\n", i, loss, avg_loss, sec(clock()-time), *net.seen);
free_data(train);
if((i % 100) == 0) net.learning_rate *= .1;
if(i%100==0){
@@ -61,8 +59,8 @@
int m = plist->size;
free_list(plist);
- data val = load_data(paths, m, 0, labels, 6, net.w, net.h);
- float *acc = network_accuracies(net, val);
+ data val = load_data_old(paths, m, 0, labels, 6, net.w, net.h);
+ float *acc = network_accuracies(net, val, 2);
printf("Validation Accuracy: %f, %d images\n", acc[0], m);
free_data(val);
}
@@ -77,7 +75,8 @@
srand(2222222);
int i = 0;
char **names = dice_labels;
- char input[256];
+ char buff[256];
+ char *input = buff;
int indexes[6];
while(1){
if(filename){
@@ -85,7 +84,8 @@
}else{
printf("Enter Image Path: ");
fflush(stdout);
- fgets(input, 256, stdin);
+ input = fgets(input, 256, stdin);
+ if(!input) return;
strtok(input, "\n");
}
image im = load_image_color(input, net.w, net.h);
--
Gitblit v1.10.0