code cleanup
This commit is contained in:
+24
-18
@@ -1,12 +1,12 @@
|
||||
use crate::AppState;
|
||||
use crate::data_provider::card_stats::{
|
||||
add_stat_list, delete_stat, load_stats_of_set, update_stat_score,
|
||||
};
|
||||
use crate::data_provider::history::{HistoryItem, push_note};
|
||||
use crate::data_provider::history::{push_note, HistoryItem};
|
||||
use crate::repetitions::CardSetSettings;
|
||||
use crate::AppState;
|
||||
use chrono::{DateTime, Utc};
|
||||
use rand::distr::Distribution;
|
||||
use rand::distr::weighted::WeightedIndex;
|
||||
use rand::distr::Distribution;
|
||||
use rand::prelude::SliceRandom;
|
||||
use rand::rng;
|
||||
use rand::rngs::ThreadRng;
|
||||
@@ -399,13 +399,13 @@ impl CardSet {
|
||||
index
|
||||
}
|
||||
OrderModule::WorstWordsSRS(mut module) => {
|
||||
if module.initialized == false {
|
||||
module.init(self)
|
||||
}
|
||||
let index = module.next(self);
|
||||
self.order_module = OrderModule::WorstWordsSRS(module);
|
||||
index
|
||||
}
|
||||
if module.initialized == false {
|
||||
module.init(self)
|
||||
}
|
||||
let index = module.next(self);
|
||||
self.order_module = OrderModule::WorstWordsSRS(module);
|
||||
index
|
||||
}
|
||||
};
|
||||
|
||||
self.current_word_index = Some(index);
|
||||
@@ -433,9 +433,9 @@ impl CardSet {
|
||||
self.order_module = OrderModule::RandomSRS(module);
|
||||
}
|
||||
OrderModule::WorstWordsSRS(mut module) => {
|
||||
module.open(status, index, word.clone());
|
||||
self.order_module = OrderModule::WorstWordsSRS(module);
|
||||
}
|
||||
module.open(status, index, word.clone());
|
||||
self.order_module = OrderModule::WorstWordsSRS(module);
|
||||
}
|
||||
}
|
||||
update_stat_score(word, &self.state.lock().unwrap().connection);
|
||||
push_note(
|
||||
@@ -596,9 +596,7 @@ impl SRSModule for WorstWordsSRSModule {
|
||||
self.queue.pop().unwrap()
|
||||
}
|
||||
|
||||
|
||||
fn open(&mut self, _: WordOpenMode, _: usize, _: CardStatistics) {
|
||||
}
|
||||
fn open(&mut self, _: WordOpenMode, _: usize, _: CardStatistics) {}
|
||||
|
||||
fn init(&mut self, _: &mut CardSet) {
|
||||
self.initialized = true;
|
||||
@@ -618,9 +616,17 @@ impl WorstWordsSRSModule {
|
||||
}
|
||||
|
||||
fn fill_pool(&mut self, set: &CardSet) {
|
||||
let mut sorted = set.set.clone().into_iter().zip(0..set.set.len()).collect::<Vec<_>>();
|
||||
let mut sorted = set
|
||||
.set
|
||||
.clone()
|
||||
.into_iter()
|
||||
.zip(0..set.set.len())
|
||||
.collect::<Vec<_>>();
|
||||
sorted.sort_by_key(|c| c.0.score);
|
||||
let mut worst = sorted[0..self.pool_size].iter().map(|(_, index)| *index).collect::<Vec<usize>>();
|
||||
let mut worst = sorted[0..self.pool_size]
|
||||
.iter()
|
||||
.map(|(_, index)| *index)
|
||||
.collect::<Vec<usize>>();
|
||||
worst.shuffle(&mut rand::rng());
|
||||
self.pool = worst;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user