two more perceptron changes

tikz/perceptron-or-task/Makefile

@@ -0,0 +1,35 @@
+SOURCE = perceptron-or-task
+DELAY = 80
+DENSITY = 300
+WIDTH = 512
+
+make:
+	pdflatex $(SOURCE).tex -output-format=pdf
+	make clean
+
+clean:
+	rm -rf  $(TARGET) *.class *.html *.log *.aux *.data *.gnuplot
+
+gif:
+	pdfcrop $(SOURCE).pdf
+	convert -verbose -delay $(DELAY) -loop 0 -density $(DENSITY) $(SOURCE)-crop.pdf $(SOURCE).gif
+	make clean
+
+png:
+	make
+	make svg
+	inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png
+
+transparentGif:
+	convert $(SOURCE).pdf -transparent white result.gif
+	make clean
+
+svg:
+	make
+	#inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE).svg
+	pdf2svg $(SOURCE).pdf $(SOURCE).svg
+	# Necessary, as pdf2svg does not always create valid svgs:
+	inkscape $(SOURCE).svg --export-plain-svg=$(SOURCE).svg
+	rsvg-convert -a -w $(WIDTH) -f svg $(SOURCE).svg -o $(SOURCE)2.svg
+	inkscape $(SOURCE)2.svg --export-plain-svg=$(SOURCE).svg
+	rm $(SOURCE)2.svg

tikz/perceptron-or-task/Readme.md

@@ -0,0 +1,3 @@
+Compiled example
+----------------
+![Example](perceptron-or-task.png)

tikz/perceptron-or-task/perceptron-or-task.tex

@@ -0,0 +1,31 @@
+\documentclass{article}
+\usepackage[pdftex,active,tightpage]{preview}
+\setlength\PreviewBorder{2mm}
+
+\usepackage{amsmath}
+\usepackage{tikz}
+\usetikzlibrary{shapes, calc, shapes, arrows} 
+
+\tikzstyle{input}=[draw,fill=red!50,circle,minimum size=20pt,inner sep=0pt]
+\tikzstyle{hidden}=[draw,fill=green!50,circle,minimum size=20pt,inner sep=0pt]
+\tikzstyle{output}=[draw,fill=blue!50,circle,minimum size=20pt,inner sep=0pt]
+\tikzstyle{bias}=[draw,dashed,fill=gray!50,circle,minimum size=20pt,inner sep=0pt]
+
+\tikzstyle{stateTransition}=[->, thick]
+\DeclareMathOperator{\xor}{XOR}
+\begin{document}
+\begin{preview}
+\begin{tikzpicture}[scale=2]
+	\node (x)[input] at (0,1) {$x$};
+	\node (y)[input] at (0,0) {$y$};
+	\node (o)[output] at (1,0.5) {$1$};
+
+	\draw[stateTransition] (x) -- (o) node [midway,above=-0.06cm] {$1$};
+	\draw[stateTransition] (y) -- (o) node [midway,above=-0.06cm] {$1$};
+
+
+	\draw[stateTransition] (o) -- (2,0.5) node [midway,above=-0.1cm] {$x \lor y$};
+
+\end{tikzpicture}
+\end{preview}
+\end{document}

tikz/perceptron-xor-task/perceptron-xor-task.tex

@@ -21,7 +21,7 @@
 	\node (h1)[hidden] at (1, 1.5) {$1$};
 	\node (h2)[hidden] at (1, 0.5) {$2$};
 	\node (h3)[hidden] at (1,-0.5) {$1$};
-	\node (o1)[output] at (2,0.5) {};
+	\node (o1)[output] at (2,0.5) {$1$};
 
 	\draw[stateTransition] (x) -- (h1) node [midway,above=-0.06cm] {$1$};
 	\draw[stateTransition] (x) -- (h2) node [midway,above=-0.06cm] {$1$};