Merge pull request #1 from bukka/master

Pull Request

Author: ekojs

README.md

@@ -0,0 +1,9 @@
+4 2 1
+-1 -1
+-1
+-1 1
+-1
+1 -1
+-1
+1 1
+1

examples/logic_gates/and.data

@@ -0,0 +1,9 @@
+4 2 1
+-1 -1
+1
+-1 1
+1
+1 -1
+1
+1 1
+-1

examples/logic_gates/nand.data

@@ -0,0 +1,9 @@
+4 2 1
+-1 -1
+1
+-1 1
+-1
+1 -1
+-1
+1 1
+-1

examples/logic_gates/nor.data

@@ -0,0 +1,5 @@
+2 1 1
+-1
+1
+1
+-1

examples/logic_gates/not.data

@@ -0,0 +1,9 @@
+4 2 1
+-1 -1
+-1
+-1 1
+1
+1 -1
+1
+1 1
+1

examples/logic_gates/or.data

@@ -16,7 +16,10 @@
 
 	$filename = dirname(__FILE__) . "/xor.data";
 	if (fann_train_on_file($ann, $filename, $max_epochs, $epochs_between_reports, $desired_error))
-		fann_save($ann, dirname(__FILE__) . "/xor_float.net");
+		print('xor trained.<br>' . PHP_EOL);
+
+	if (fann_save($ann, dirname(__FILE__) . "/xor_float.net"))
+		print('xor_float.net saved.<br><a href="simple_test.php">Test</a>' . PHP_EOL);
 
 	fann_destroy($ann);
 }

examples/simple_test.php renamed to examples/logic_gates/simple_test.php

@@ -0,0 +1,48 @@
+<?php
+
+function test($ann, $test_data) {
+	$train_file = (dirname(__FILE__) . '/' . $ann . '_float.net');
+	if (!is_file($train_file)) {
+		print('The file ' . $ann . '_float.net has not been created! Please run train_all.php to generate it.<br>' . PHP_EOL);
+	} else{
+		$ann = fann_create_from_file($train_file);
+		if ($ann) {
+			$calc_out = fann_run($ann, $test_data);
+			
+			$num_inputs = count($test_data);
+			$num_outputs = count($calc_out);
+			
+			$test_result = $ann . ' test (';
+			for($i = 0; $i < $num_inputs; $i++) {
+				$test_result .= $test_data[$i];
+
+				if ($i < $num_inputs - 1) {
+					$test_result .= ', ';
+				}
+			}
+			$test_result .= ') -> ';
+			for($i = 0; $i < $num_outputs; $i++) {
+				$test_result .= $calc_out[$i];
+
+				if ($i < $num_outputs - 1) {
+					$test_result .= ', ';
+				}
+			}
+			print($test_result . '<br>' . PHP_EOL);
+			
+			fann_destroy($ann);
+		} else {
+			die("Invalid file format" . PHP_EOL);
+		}
+	}
+}
+
+test('and', array(1, 1));
+test('nand', array(-1, -1));
+test('nor', array(-1, -1));
+test('not', array(-1));
+test('or', array(1, -1));
+test('xnor', array(-1, -1));
+test('xor', array(-1, 1));
+
+?>

examples/simple_train.php renamed to examples/logic_gates/simple_train.php

@@ -0,0 +1,35 @@
+<?php
+
+function train($data, $num_input, $num_output, $num_layers, $num_neurons_hidden, $desired_error, $max_epochs, $epochs_between_reports){
+	
+	$ann = fann_create_standard($num_layers, $num_input, $num_neurons_hidden, $num_output);
+
+	if ($ann) {
+		fann_set_activation_function_hidden($ann, FANN_SIGMOID_SYMMETRIC);
+		fann_set_activation_function_output($ann, FANN_SIGMOID_SYMMETRIC);
+
+		$filename = dirname(__FILE__) . '/' . $data . '.data';
+		if (fann_train_on_file($ann, $filename, $max_epochs, $epochs_between_reports, $desired_error)) {
+			print($data . ' trained.<br>' . PHP_EOL);
+        }
+		
+		if (fann_save($ann, dirname(__FILE__) . '/' . $data . '_float.net')) {
+			print($data . '_float.net saved.<br>' . PHP_EOL);
+        }
+		
+		fann_destroy($ann);
+	}
+}
+
+train('and', 2, 1, 3, 3, 0.001, 500000, 1000);
+train('nand', 2, 1, 3, 3, 0.001, 500000, 1000);
+train('nor', 2, 1, 3, 3, 0.001, 500000, 1000);
+train('not', 1, 1, 3, 3, 0.001, 500000, 1000);
+train('or', 2, 1, 3, 3, 0.001, 500000, 1000);
+train('xnor', 2, 1, 3, 3, 0.001, 500000, 1000);
+train('xor', 2, 1, 3, 3, 0.001, 500000, 1000);
+
+
+print("<a href='test_all.php'>Test All</a>");
+
+?>