♻️ Extract Regression into its own module

src/trainer.rs

@@ -19,14 +19,14 @@ use tokio::task::yield_now;
 use tokio::time::sleep;
 
 pub use self::client::*;
+pub use self::model::*;
 pub use self::regression::*;
 pub use self::requests::*;
 pub use self::responses::*;
 use self::sample::*;
 use crate::math::logit;
 use crate::opts::TrainOpts;
 use crate::prelude::*;
-use crate::trainer::model::{Model, Regression};
 use crate::{database, wargaming};
 
 pub async fn run(opts: TrainOpts) -> Result {

src/trainer/client.rs

@@ -1,10 +1,9 @@
 use reqwest::StatusCode;
 
 use crate::prelude::*;
-use crate::trainer::model::Regression;
-use crate::trainer::requests;
 use crate::trainer::requests::Given;
 use crate::trainer::responses::RecommendResponse;
+use crate::trainer::{requests, Regression};
 
 #[derive(Clone)]
 pub struct Client {

src/trainer/model.rs

@@ -1,7 +1,5 @@
-use nalgebra::DVector;
-use serde::{Deserialize, Serialize};
-
 use crate::prelude::*;
+use crate::trainer::Regression;
 
 #[derive(Default)]
 pub struct Model {
@@ -10,17 +8,3 @@ pub struct Model {
         AHashMap<wargaming::TankId, AHashMap<wargaming::TankId, Regression>>,
     >,
 }
-
-#[derive(Serialize, Deserialize)]
-pub struct Regression {
-    pub bias: f64,
-    pub k: f64,
-    pub x: DVector<f64>,
-    pub y: DVector<f64>,
-}
-
-impl Regression {
-    pub fn predict(&self, x: f64) -> f64 {
-        self.k * x + self.bias
-    }
-}

src/trainer/regression.rs

@@ -0,0 +1,16 @@
+use nalgebra::DVector;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Regression {
+    pub bias: f64,
+    pub k: f64,
+    pub x: DVector<f64>,
+    pub y: DVector<f64>,
+}
+
+impl Regression {
+    pub fn predict(&self, x: f64) -> f64 {
+        self.k * x + self.bias
+    }
+}