Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@ keywords = ["nn", "neural-network", "classifier", "backpropagation",
"machine-learning"]

[dependencies]
rand = "0.3.7"
rustc-serialize = "0.3.12"
time = "0.1.24"
rand = "0.3.14"
rustc-serialize = "0.3.19"
8 changes: 3 additions & 5 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,13 @@

extern crate rand;
extern crate rustc_serialize;
extern crate time;

use HaltCondition::{ Epochs, MSE, Timer };
use LearningMode::{ Incremental };
use std::iter::{Zip, Enumerate};
use std::slice;
use std::time::{ Duration, Instant };
use rustc_serialize::json;
use time::{ Duration, PreciseTime };
use rand::Rng;

static DEFAULT_LEARNING_RATE: f64 = 0.3f64;
Expand Down Expand Up @@ -299,7 +298,7 @@ impl NN {
let mut prev_deltas = self.make_weights_tracker(0.0f64);
let mut epochs = 0u32;
let mut training_error_rate = 0f64;
let start_time = PreciseTime::now();
let start_time = Instant::now();

loop {

Expand All @@ -321,8 +320,7 @@ impl NN {
if training_error_rate <= target_error { break }
},
Timer(duration) => {
let now = PreciseTime::now();
if start_time.to(now) >= duration { break }
if start_time.elapsed() >= duration { break }
}
}
}
Expand Down
1 change: 0 additions & 1 deletion tests/xor.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
extern crate nn;
extern crate time;

use nn::{NN, HaltCondition, LearningMode};

Expand Down