Permalink
Browse files

Release 1.0.4

  • Loading branch information...
1 parent 57e4e6a commit 6d0051ab66191534103ecc2c9833a359d00b17c3 @Wicker25 committed Jun 3, 2011
Showing with 2,093 additions and 2,043 deletions.
  1. +1 −1 AUTHORS
  2. +4 −1 CMakeLists.txt
  3. +10 −0 ChangeLog
  4. +1 −1 VERSION
  5. +3 −3 data/character/h.net
  6. +1 −0 data/character/train/character.train
  7. +1 −0 data/character/train/h.part
  8. +43 −0 examples/face.cpp
  9. +7 −0 examples/train/face.net
  10. +2,018 −2,033 examples/train/face.train
  11. +4 −4 src/network-train.cpp
View
@@ -1 +1 @@
-Giacomo Trudu aka "Wicker25" - wicker25 [at] gmail [dot] com
+Giacomo Trudu aka `Wicker25` - < wicker25@gmail.com >
View
@@ -9,7 +9,7 @@ cmake_minimum_required( VERSION 2.6 )
# Imposto le versioni degli strumenti
set( SEROTONINA_VERSION_MAJOR 1 )
set( SEROTONINA_VERSION_MINOR 0 )
-set( SEROTONINA_VERSION_PATCH 3 )
+set( SEROTONINA_VERSION_PATCH 4 )
set( SEROTONINA_PLOT_VERSION_MAJOR 1 )
set( SEROTONINA_PLOT_VERSION_MINOR 0 )
@@ -116,6 +116,9 @@ target_link_libraries( st_face_recognition ${OpenCV_LIBS} )
install_targets( /lib serotonina )
# Installatore degli headers
+install( FILES ${CMAKE_SOURCE_DIR}/include/serotonina.hpp
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
+
install( DIRECTORY ${CMAKE_SOURCE_DIR}/include/serotonina
DESTINATION ${CMAKE_INSTALL_PREFIX}/include
FILES_MATCHING
View
@@ -1,5 +1,15 @@
ChangeLog of Serotonina - A Simple C++ Artificial Neural Network Library
+============= Serotonina 1.0.4 - urgency=low =============
+
+2011-06-05 Wicker25 < wicker25@gmail.com >
+
+ * all: Added `examples/face.cpp`.
+
+ * network-train.cpp (function `Network->ComputeError`): Removed unused iterator `size_t j`.
+
+ * CMakeList.txt: Fixed `serotonina.hpp` installer.
+
============= Serotonina 1.0.3 - urgency=medium =============
2011-06-02 Wicker25 < wicker25@gmail.com >
View
@@ -1 +1 @@
-1.0.3
+1.0.4
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -477,6 +477,7 @@
0.1020 0.4000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.6000 0.0000 0.2000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.2000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.2000 1.0000 0.0000 0.0000 0.0000 0.0000 0.1020 0.2000 1.0000 0.1020 0.2353 1.0000 0.8667 1.0000 1.0000 1.0000 1.0000 0.8667 0.9686 0.2000 0.4000 0.8353 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.8000 0.3020 0.4353 0.8000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.6000 0.4000 0.6000 0.7020 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.6000 0.5333 0.6000 0.6000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4353 0.6000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.3020 0.5020 :0.0000
0.0000 0.0000 0.2510 0.3765 0.0000 0.0000 0.0000 0.0000 0.5020 0.1255 0.0000 0.0000 0.7529 0.6667 0.0000 0.0000 0.0000 0.0863 1.0000 0.2510 0.0000 0.0000 1.0000 0.3333 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.2510 1.0000 0.0863 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.5020 1.0000 1.0000 0.7529 0.7529 0.7529 0.7529 0.7922 1.0000 0.3333 0.0000 0.5020 0.7529 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.7529 0.6275 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.7529 0.5020 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.7529 0.5020 0.0000 0.0000 0.0000 0.5020 1.0000 1.0000 0.0000 0.2510 1.0000 0.3765 0.0000 0.0000 0.0000 0.0000 0.1686 0.2510 0.0000 :0.0000
0.2510 0.5020 0.1255 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.2510 0.0000 0.0000 0.0000 0.0000 0.0000 0.2510 0.0863 0.4196 1.0000 0.4196 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.5020 0.1686 0.9608 0.7098 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.5020 0.0000 0.7529 0.8784 0.5020 0.5020 0.3333 0.2510 0.4588 1.0000 0.2510 0.0000 0.7529 0.9608 0.5020 0.6667 0.7529 0.9608 1.0000 0.6275 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.3333 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.0863 0.0000 0.0000 0.5451 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5451 0.6275 0.0000 0.0000 0.0000 0.7529 0.9176 0.0000 0.0000 :0.0000
+0.0000 0.1529 0.5020 0.1020 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4510 1.0000 0.2510 0.0000 0.2510 1.0000 0.6510 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0510 0.8510 0.9020 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 1.0000 1.0000 0.8510 0.8510 1.0000 0.6510 0.3529 0.0000 0.7020 0.9020 0.0000 0.1529 0.2510 0.3529 0.9529 0.7020 0.4000 0.0000 0.7529 0.7529 0.0000 0.0000 0.0000 0.0000 0.7529 0.6510 0.0000 0.2510 1.0000 0.5529 0.0000 0.0000 0.0000 0.0000 0.5020 0.7529 0.0000 0.5020 1.0000 0.5020 0.0000 0.0000 0.0000 0.0000 0.5020 0.7529 0.0000 0.3529 0.7529 0.2000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 :0.0000
@@ -36,3 +36,4 @@
0.1020 0.4000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.6000 0.0000 0.2000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.2000 1.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.0000 0.2000 1.0000 0.0000 0.0000 0.0000 0.0000 0.1020 0.2000 1.0000 0.1020 0.2353 1.0000 0.8667 1.0000 1.0000 1.0000 1.0000 0.8667 0.9686 0.2000 0.4000 0.8353 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.8000 0.3020 0.4353 0.8000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.6000 0.4000 0.6000 0.7020 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.6000 0.5333 0.6000 0.6000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4353 0.6000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.3020 0.5020
0.0000 0.0000 0.2510 0.3765 0.0000 0.0000 0.0000 0.0000 0.5020 0.1255 0.0000 0.0000 0.7529 0.6667 0.0000 0.0000 0.0000 0.0863 1.0000 0.2510 0.0000 0.0000 1.0000 0.3333 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.2510 1.0000 0.0863 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.5020 1.0000 1.0000 0.7529 0.7529 0.7529 0.7529 0.7922 1.0000 0.3333 0.0000 0.5020 0.7529 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.7529 0.6275 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.7529 0.5020 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.0000 0.0000 0.7529 0.5020 0.0000 0.0000 0.0000 0.5020 1.0000 1.0000 0.0000 0.2510 1.0000 0.3765 0.0000 0.0000 0.0000 0.0000 0.1686 0.2510 0.0000
0.2510 0.5020 0.1255 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.2510 0.0000 0.0000 0.0000 0.0000 0.0000 0.2510 0.0863 0.4196 1.0000 0.4196 0.0000 0.0000 0.0000 0.0000 0.0000 1.0000 0.5020 0.1686 0.9608 0.7098 0.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.5020 0.0000 0.7529 0.8784 0.5020 0.5020 0.3333 0.2510 0.4588 1.0000 0.2510 0.0000 0.7529 0.9608 0.5020 0.6667 0.7529 0.9608 1.0000 0.6275 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.2510 1.0000 0.3333 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.0863 0.0000 0.0000 0.5451 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5451 0.6275 0.0000 0.0000 0.0000 0.7529 0.9176 0.0000 0.0000
+0.0000 0.1529 0.5020 0.1020 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.4510 1.0000 0.2510 0.0000 0.2510 1.0000 0.6510 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0510 0.8510 0.9020 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 0.0000 0.0000 0.0000 0.5020 1.0000 1.0000 1.0000 0.8510 0.8510 1.0000 0.6510 0.3529 0.0000 0.7020 0.9020 0.0000 0.1529 0.2510 0.3529 0.9529 0.7020 0.4000 0.0000 0.7529 0.7529 0.0000 0.0000 0.0000 0.0000 0.7529 0.6510 0.0000 0.2510 1.0000 0.5529 0.0000 0.0000 0.0000 0.0000 0.5020 0.7529 0.0000 0.5020 1.0000 0.5020 0.0000 0.0000 0.0000 0.0000 0.5020 0.7529 0.0000 0.3529 0.7529 0.2000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
View
@@ -0,0 +1,43 @@
+/*
+ Title --- xor.cpp
+
+ Copyright (C) 2010 Giacomo Trudu - wicker25[at]gmail[dot]com
+
+ This file is part of Serotonina.
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include <iostream>
+#include <cstdio>
+#include <cstdlib>
+
+#include <serotonina.hpp>
+
+int main( int argc, char **argv ) {
+
+ // Creo la rete neurale
+ Serotonina::Network network( 3, 280, 15, 1 );
+
+ // Addestro la rete neurale
+ network.SetTrainingAlgorithm( Serotonina::TRAIN_RPROP );
+ network.TrainOnFile( "train/face.train", 0.0001, 100000, 1 );
+
+ // Salvo la rete in un file
+ network.Save( "train/face.net" );
+
+ return 0;
+}
+
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 6d0051a

Please sign in to comment.