Browse Source

Updating Network's train function

chabisik 2 years ago
parent
commit
99f6978d02
2 changed files with 10 additions and 8 deletions
  1. 7
    6
      annclasses.cpp
  2. 3
    2
      main.cpp

+ 7
- 6
annclasses.cpp View File

@@ -162,16 +162,17 @@ bool Network::train(const vector<vector<float>> &inputs, const vector<vector<flo
162 162
             {
163 163
                 vector<vector<float>> all_activated_outputs(get_neurons_number());
164 164
                 vector<vector<float>> all_derrors(get_neurons_number()-inputs.at(0).size());
165
-                int neurons_counter1 = 0;
166
-                int neurons_counter2 = 0;
165
+                int layer_counter;
166
+                int neurons_counter1;
167
+                int neurons_counter2;
167 168
                 for(int index(batch_index) ; index<inputs.size() && index<batch_index+batch_size ; index++)//batch_size not yet used
168 169
                 {
169 170
                     forward(inputs.at(index), targets.at(index));
170 171
                     set_errors(targets.at(index));
171 172
 
172
-                    int layer_counter = 0;
173
-                    //int neurons_counter1 = 0;
174
-                    //int neurons_counter2 = 0;
173
+                    layer_counter = 0;
174
+                    neurons_counter1 = 0;
175
+                    neurons_counter2 = 0;
175 176
                     for(list<forward_list<Neuron>>::iterator cur_layer(layers.begin()) ; cur_layer!=layers.end() ; ++cur_layer)
176 177
                     {
177 178
                         layer_counter++;
@@ -196,7 +197,7 @@ bool Network::train(const vector<vector<float>> &inputs, const vector<vector<flo
196 197
                     }
197 198
                 }
198 199
 
199
-                int layer_counter = 0;
200
+                layer_counter = 0;
200 201
                 neurons_counter1 = 0;
201 202
                 neurons_counter2 = 0;
202 203
                 for(list<forward_list<Neuron>>::iterator cur_layer(layers.begin()) ; cur_layer!=layers.end() ; ++cur_layer)

+ 3
- 2
main.cpp View File

@@ -11,15 +11,16 @@ int main(int argc, char *argv[])
11 11
 
12 12
     cout << "Bonjour et bienvenu" << endl;
13 13
     
14
-    Network network(15, 3);/*
14
+    Network network(2, 3);/*
15 15
     network.print();
16 16
     cout << endl << endl;
17 17
     network.train({1.0,1.0,1.0}, {1.0,2.0,3.0}, 0.001, 100000);
18 18
     //network.print();
19 19
     cout << endl << endl;
20 20
     network.print();*/
21
+    network.train({{1.0,1.0,1.0},{2.0,1.0,1.0}}, {{1.0,2.0,3.0},{1.0,2.0,6.0}}, 0.001, 1000000, 1);
21 22
     cout << "Network has " << network.get_neurons_number() << " neurons" << endl;
22
-    for(auto e : network.predict({{1.0,1.0,1.0},{2.0,1.3,0.0}},false))
23
+    for(auto e : network.predict({{1.0,1.0,1.0},{2.0,1.0,1.0}},true))
23 24
     {
24 25
         cout << e << " " << endl;
25 26
     }

Loading…
Cancel
Save