+ refactoring
+ neuronetworksolver optimization