Refactor Internal Response API

src/main.rs

@@ -100,9 +100,10 @@ fn main() -> Result<(), io::Error> {
                     Some(n) if n.parse::<usize>().unwrap_or_default() > 0 => n.parse::<usize>().unwrap_or(5),
                     _ => 5
                 };
-                let prediction = &markov_chain.predict(&query, predict_count);
+                let predictions = &markov_chain.predict(&query, predict_count);
                 //println!("Query: {}, Prediction:{}", query, prediction);
-                let response = Response::from_string(prediction);
+                let response = Response::from_string(
+                    format!("[\"{}\",[{}]]", query, predictions.join(",")));
                 request.respond(response);
                 let now = std::time::SystemTime::now();
                 let elapsed = now.duration_since(last_update).expect("Time went backwards");

src/predictors/basic_markov.rs

@@ -64,7 +64,7 @@ impl Predictor for MarkovChainPredictor {
         self.chain = HashMap::new();
     }
 
-    fn predict(&self, query: &str, n: usize) -> String {
+    fn predict(&self, query: &str, n: usize) -> Vec<String> {
         if let Some(top_words) =
             get_top_following_words(
                 &self.chain,
@@ -77,9 +77,9 @@ impl Predictor for MarkovChainPredictor {
                 .into_iter()
                 .map(|(word, _)| format!("\"{} {}\"", query, word))
                 .collect();
-            return format!("[\"{}\",[{}]]", query, predictions.join(","));
+            return predictions;
         }
-        String::new()
+        Vec::<String>::new()
     }
 }
 

src/predictors/basic_set.rs

@@ -85,7 +85,7 @@ impl Predictor for SetPredictor {
         
     }
 
-    fn predict(&self, query: &str, n: usize) -> String {
+    fn predict(&self, query: &str, n: usize) -> Vec<String> {
         if let Some(top_words) =
             get_top_completions(
                 &self,
@@ -99,9 +99,9 @@ impl Predictor for SetPredictor {
                 .into_iter()
                 .map(|(word, _)| format!("\"{}\"", format!("{} {}",query_prefix, word).trim()))
                 .collect();
-            return format!("[\"{}\",[{}]]", query, predictions.join(","));
+            return predictions;
         }
-        String::new()
+        Vec::<String>::new()
     }
 }
 

src/predictors/composite.rs

@@ -41,13 +41,13 @@ impl Predictor for CompositePredictor {
         
     }
 
-    fn predict(&self, query: &str, n: usize) -> String {
-        let markov_prediction = self.markov_predictor.predict(query, n);
-        if markov_prediction.len() > 7+query.len() {
-            return markov_prediction;
+    fn predict(&self, query: &str, n: usize) -> Vec<String> {
+        let mut prediction = self.markov_predictor.predict(query, n);
+        if prediction.len() < n {
+            prediction.append(&mut self.set_predictor.predict(query, n));
+            prediction.truncate(n);
         }
-        let set_prediction = self.set_predictor.predict(query, n);
-        set_prediction
+        prediction
     }
 }
 

src/predictors/mod.rs

@@ -6,7 +6,7 @@ pub mod composite;
 
 pub trait Predictor {
 
-    fn predict(&self, query: &str, n: usize) -> String;
+    fn predict(&self, query: &str, n: usize) -> Vec<String>;
     fn update(&mut self, query: &str) -> Result<(),Box<dyn std::error::Error>>;
     fn decay(&mut self) -> ();