Merge upstream 'parameter update big-change'.

Merge remote-tracking branch 'upstream/master'

1 files changed, 9 insertions, 9 deletions

diff --git a/examples/test_nn_lib.lua b/examples/test_nn_lib.lua
index 6fdbd67..5444810 100644
--- a/examples/test_nn_lib.lua
+++ b/examples/test_nn_lib.lua
@@ -144,17 +144,17 @@ for data in buffer.get_data, buffer do
     main:back_propagate(err_output, err_input, input, output)
     main:update(err_input, input, output)
 
---    nerv.utils.printf("cross entropy: %.8f\n", sm.total_ce)
---    nerv.utils.printf("correct: %d\n", sm.total_correct)
---    nerv.utils.printf("frames: %d\n", sm.total_frames)
---    nerv.utils.printf("err/frm: %.8f\n", sm.total_ce / sm.total_frames)
---    nerv.utils.printf("accuracy: %.8f\n", sm.total_correct / sm.total_frames)
+--    nerv.printf("cross entropy: %.8f\n", sm.total_ce)
+--    nerv.printf("correct: %d\n", sm.total_correct)
+--    nerv.printf("frames: %d\n", sm.total_frames)
+--    nerv.printf("err/frm: %.8f\n", sm.total_ce / sm.total_frames)
+--    nerv.printf("accuracy: %.8f\n", sm.total_correct / sm.total_frames)
     collectgarbage("collect")
 end
-nerv.utils.printf("cross entropy: %.8f\n", sm.total_ce)
-nerv.utils.printf("correct: %d\n", sm.total_correct)
-nerv.utils.printf("accuracy: %.3f%%\n", sm.total_correct / sm.total_frames * 100)
-nerv.utils.printf("writing back...\n")
+nerv.printf("cross entropy: %.8f\n", sm.total_ce)
+nerv.printf("correct: %d\n", sm.total_correct)
+nerv.printf("accuracy: %.3f%%\n", sm.total_correct / sm.total_frames * 100)
+nerv.printf("writing back...\n")
 cf = nerv.ChunkFile("output.nerv", "w")
 for i, p in ipairs(main:get_params()) do
     print(p)