From 1d53b6414e0cd81043d7c76aa89f4f97da5e479f Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 23 Jan 2014 19:24:37 +0000
Subject: [PATCH] Stable on MNIST, about to change a lot
---
src/network.c | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/src/network.c b/src/network.c
index 29234da..07ac621 100644
--- a/src/network.c
+++ b/src/network.c
@@ -63,7 +63,7 @@
}
else if(net.types[i] == CONNECTED){
connected_layer layer = *(connected_layer *)net.layers[i];
- update_connected_layer(layer, step, momentum, decay);
+ update_connected_layer(layer, step, momentum, 0);
}
}
}
@@ -174,19 +174,37 @@
return (y[class]?1:0);
}
-double train_network_sgd(network net, data d, double step, double momentum,double decay)
+double train_network_sgd(network net, data d, int n, double step, double momentum,double decay)
{
int i;
int correct = 0;
- for(i = 0; i < d.X.rows; ++i){
+ for(i = 0; i < n; ++i){
int index = rand()%d.X.rows;
correct += train_network_datum(net, d.X.vals[index], d.y.vals[index], step, momentum, decay);
- if((i+1)%10 == 0){
- printf("%d: %f\n", (i+1), (double)correct/(i+1));
- }
+ //if((i+1)%10 == 0){
+ // printf("%d: %f\n", (i+1), (double)correct/(i+1));
+ //}
}
- return (double)correct/d.X.rows;
+ return (double)correct/n;
}
+double train_network_batch(network net, data d, int n, double step, double momentum,double decay)
+{
+ int i;
+ int correct = 0;
+ for(i = 0; i < n; ++i){
+ int index = rand()%d.X.rows;
+ double *x = d.X.vals[index];
+ double *y = d.y.vals[index];
+ forward_network(net, x);
+ int class = get_predicted_class_network(net);
+ backward_network(net, x, y);
+ correct += (y[class]?1:0);
+ }
+ update_network(net, step, momentum, decay);
+ return (double)correct/n;
+
+}
+
void train_network(network net, data d, double step, double momentum, double decay)
{
@@ -269,6 +287,27 @@
}
}
+double *network_predict(network net, double *input)
+{
+ forward_network(net, input);
+ double *out = get_network_output(net);
+ return out;
+}
+
+matrix network_predict_data(network net, data test)
+{
+ int i,j;
+ int k = get_network_output_size(net);
+ matrix pred = make_matrix(test.X.rows, k);
+ for(i = 0; i < test.X.rows; ++i){
+ double *out = network_predict(net, test.X.vals[i]);
+ for(j = 0; j < k; ++j){
+ pred.vals[i][j] = out[j];
+ }
+ }
+ return pred;
+}
+
void print_network(network net)
{
int i,j;
@@ -306,17 +345,12 @@
fprintf(stderr, "\n");
}
}
+
double network_accuracy(network net, data d)
{
- int i;
- int correct = 0;
- int k = get_network_output_size(net);
- for(i = 0; i < d.X.rows; ++i){
- forward_network(net, d.X.vals[i]);
- double *out = get_network_output(net);
- int guess = max_index(out, k);
- if(d.y.vals[i][guess]) ++correct;
- }
- return (double)correct/d.X.rows;
+ matrix guess = network_predict_data(net, d);
+ double acc = matrix_accuracy(d.y, guess);
+ free_matrix(guess);
+ return acc;
}
--
Gitblit v1.10.0