@@ -503,37 +503,39 @@ impl<TX: Number + FloatNumber + RealNumber, TY: Number + Ord, X: Array2<TX>, Y:
503503 /// Predict class labels for samples in `x`.
504504 /// * `x` - _KxM_ data where _K_ is number of observations and _M_ is number of features.
505505 pub fn predict ( & self , x : & X ) -> Result < Y , Failed > {
506- if self . coefficients . is_none ( ) {
507- return Err ( Failed :: predict (
508- "'fit' should be called before calling 'predict'" ,
509- ) ) ;
510- }
511- let n = x. shape ( ) . 0 ;
512- let mut result = Y :: zeros ( n) ;
513- if self . num_classes == 2 {
514- let y_hat = x. ab ( false , self . coefficients ( ) , true ) ;
515- let intercept = * self . intercept ( ) . get ( ( 0 , 0 ) ) ;
516- for ( i, y_hat_i) in y_hat. iterator ( 0 ) . enumerate ( ) . take ( n) {
517- result. set (
518- i,
519- self . classes ( ) [ usize:: from (
520- RealNumber :: sigmoid ( * y_hat_i + intercept) > RealNumber :: half ( ) ,
521- ) ] ,
522- ) ;
523- }
524- } else {
525- let mut y_hat = x. matmul ( & self . coefficients ( ) . transpose ( ) ) ;
526- for r in 0 ..n {
527- for c in 0 ..self . num_classes {
528- y_hat. set ( ( r, c) , * y_hat. get ( ( r, c) ) + * self . intercept ( ) . get ( ( c, 0 ) ) ) ;
506+ match ( & self . coefficients , & self . intercept , & self . classes ) {
507+ ( Some ( coefficients) , Some ( intercept) , Some ( classes) ) => {
508+ let n = x. shape ( ) . 0 ;
509+ let mut result = Y :: zeros ( n) ;
510+ if self . num_classes == 2 {
511+ let y_hat = x. ab ( false , coefficients, true ) ;
512+ let intercept = * intercept. get ( ( 0 , 0 ) ) ;
513+ for ( i, y_hat_i) in y_hat. iterator ( 0 ) . enumerate ( ) . take ( n) {
514+ result. set (
515+ i,
516+ classes[ usize:: from (
517+ RealNumber :: sigmoid ( * y_hat_i + intercept) > RealNumber :: half ( ) ,
518+ ) ] ,
519+ ) ;
520+ }
521+ } else {
522+ let mut y_hat = x. matmul ( & coefficients. transpose ( ) ) ;
523+ for r in 0 ..n {
524+ for c in 0 ..self . num_classes {
525+ y_hat. set ( ( r, c) , * y_hat. get ( ( r, c) ) + * intercept. get ( ( c, 0 ) ) ) ;
526+ }
527+ }
528+ let class_idxs = y_hat. argmax ( 1 ) ;
529+ for ( i, class_i) in class_idxs. iter ( ) . enumerate ( ) . take ( n) {
530+ result. set ( i, classes[ * class_i] ) ;
531+ }
529532 }
533+ Ok ( result)
530534 }
531- let class_idxs = y_hat. argmax ( 1 ) ;
532- for ( i, class_i) in class_idxs. iter ( ) . enumerate ( ) . take ( n) {
533- result. set ( i, self . classes ( ) [ * class_i] ) ;
534- }
535+ ( _, _, _) => Err ( Failed :: predict (
536+ "'fit' should be called before calling 'predict'" ,
537+ ) ) ,
535538 }
536- Ok ( result)
537539 }
538540
539541 /// Get estimates regression coefficients, this create a sharable reference
0 commit comments