More clean up

src/model/binary.rs

@@ -142,7 +142,9 @@ impl BinaryModel {
         elems.extend(self.process_items(team_2, -1.0));
 
         let prob = match self.win_obs {
-            BinaryModelObservation::Probit => probit_win_observation(&elems, t, 0.0, &self.storage),
+            BinaryModelObservation::Probit => {
+                ProbitWinObservation::probability(&self.storage, &elems, t, 0.0)
+            }
             BinaryModelObservation::Logit => todo!(),
         };
 

src/model/ternary.rs

@@ -169,14 +169,14 @@ impl TernaryModel {
 
         let prob_1 = match self.obs {
             TernaryModelObservation::Probit => {
-                probit_win_observation(&elems, t, margin, &self.storage)
+                ProbitWinObservation::probability(&self.storage, &elems, t, margin)
             }
             TernaryModelObservation::Logit => unimplemented!(),
         };
 
         let prob_2 = match self.obs {
             TernaryModelObservation::Probit => {
-                probit_tie_observation(&elems, t, margin, &self.storage)
+                ProbitTieObservation::probability(&self.storage, &elems, t, margin)
             }
             TernaryModelObservation::Logit => unimplemented!(),
         };