Skip to content
Snippets Groups Projects
Commit 64af57d6 authored by Michal Kravcenko's avatar Michal Kravcenko
Browse files

Merge branch 'tmp' of code.it4i.cz:bes0030/4Neuro into tmp

# Conflicts:
#	.gitlab-ci.yml
#	CMakeLists.txt
#	FindBoost.cmake
#	build.sh
#	build_scripts/windows/win_VS_build_x64_debug.bat
#	include/4neuro.h
#	src/CMakeLists.txt
#	src/DataSet/DataSet.h
#	src/General/ExprtkWrapper.h
#	src/LearningMethods/ParticleSwarm.h
#	src/NetConnection/ConnectionFunctionGeneral.h
#	src/NetConnection/ConnectionFunctionIdentity.h
#	src/Network/NeuralNetwork.h
#	src/Network/NeuralNetworkSum.h
#	src/Neuron/Neuron.h
#	src/Neuron/NeuronBinary.h
#	src/Neuron/NeuronConstant.h
#	src/Neuron/NeuronLinear.h
#	src/Neuron/NeuronLogistic.h
#	src/examples/CMakeLists.txt
#	src/message.h
#	src/tests/CMakeLists.txt
parents b0eb7b34 61389c93
No related branches found
No related tags found
No related merge requests found
Showing
with 499 additions and 301 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment