Merge pull request #39 from dandls/fix-counterfactualMethod-printer

fixes printer for NULL values
dandls · May 14, 2024 · 00ef520 · 00ef520
2 parents 0ed76f9 + e4fac43
commit 00ef520
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 42 deletions.
diff --git a/R/MOCClassif.R b/R/MOCClassif.R
@@ -281,22 +281,21 @@ MOCClassif = R6::R6Class("MOCClassif", inherit = CounterfactualMethodClassif,
     },
 
     print_parameters = function() {
-      cat(" - epsilon: ", private$epsilon, "\n")
-      cat(" - fixed_features: ", private$fixed_features, "\n")
-      cat(" - init_strategy: ", private$init_strategy, "\n")
-      cat(" - k: ", private$k, "\n")
-      cat(" - lower: ", private$lower, "\n")
-      cat(" - max_changed: ", private$max_changed, "\n")
-      cat(" - mu: ", private$mu, "\n")
-      cat(" - termination_crit: ", private$termination_crit, "\n")    
-      cat(" - n_generations: ", private$n_generations, "\n")
-      cat(" - p_mut: ", private$p_mut, "\n")
-      cat(" - p_mut_gen: ", private$p_mut_gen, "\n")
-      cat(" - p_mut_use_orig: ", private$p_mut_use_orig, "\n")
-      cat(" - p_rec: ", private$p_rec, "\n")
-      cat(" - p_rec_gen: ", private$p_rec_gen, "\n")
-      cat(" - upper: ", private$upper)
-      cat(" - weights: ", private$weights, "\n")
+      cat(" - epsilon: ", private$epsilon %??% "NULL", "\n")
+      cat(" - fixed_features: ", private$fixed_features %??% "NULL", "\n")
+      cat(" - init_strategy: ", private$init_strategy %??% "NULL", "\n")
+      cat(" - k: ", private$k %??% "NULL", "\n")
+      cat(" - lower: ", private$lower %??% "NULL", "| upper: ", private$upper %??% "NULL", "\n")
+      cat(" - max_changed: ", private$max_changed %??% "NULL", "\n")
+      cat(" - mu: ", private$mu %??% "NULL", "\n")
+      cat(" - termination_crit: ", private$termination_crit %??% "NULL", "\n")
+      cat(" - n_generations: ", private$n_generations %??% "NULL", "\n")
+      cat(" - p_mut: ", private$p_mut %??% "NULL", "\n")
+      cat(" - p_mut_gen: ", private$p_mut_gen %??% "NULL", "\n")
+      cat(" - p_mut_use_orig: ", private$p_mut_use_orig %??% "NULL", "\n")
+      cat(" - p_rec: ", private$p_rec %??% "NULL", "\n")
+      cat(" - p_rec_gen: ", private$p_rec_gen %??% "NULL", "\n")
+      cat(" - weights: ", private$weights %??% "NULL", "\n")
     }
   )
 )
diff --git a/R/MOCRegr.R b/R/MOCRegr.R
@@ -276,22 +276,21 @@ MOCRegr = R6::R6Class("MOCRegr", inherit = CounterfactualMethodRegr,
     },
 
     print_parameters = function() {
-      cat(" - epsilon: ", private$epsilon, "\n")
-      cat(" - fixed_features: ", private$fixed_features, "\n")
-      cat(" - init_strategy: ", private$init_strategy, "\n")
-      cat(" - k: ", private$k, "\n")
-      cat(" - lower: ", private$lower, "\n")
-      cat(" - max_changed: ", private$max_changed, "\n")
-      cat(" - mu: ", private$mu, "\n")
-      cat(" - termination_crit: ", private$termination_crit, "\n")    
-      cat(" - n_generations: ", private$n_generations, "\n")
-      cat(" - p_mut: ", private$p_mut, "\n")
-      cat(" - p_mut_gen: ", private$p_mut_gen, "\n")
-      cat(" - p_mut_use_orig: ", private$p_mut_use_orig, "\n")
-      cat(" - p_rec: ", private$p_rec, "\n")
-      cat(" - p_rec_gen: ", private$p_rec_gen, "\n")
-      cat(" - upper: ", private$upper)
-      cat(" - weights: ", private$weights, "\n")
+      cat(" - epsilon: ", private$epsilon %??% "NULL", "\n")
+      cat(" - fixed_features: ", private$fixed_features %??% "NULL", "\n")
+      cat(" - init_strategy: ", private$init_strategy %??% "NULL", "\n")
+      cat(" - k: ", private$k %??% "NULL", "\n")
+      cat(" - lower: ", private$lower %??% "NULL", "| upper: ", private$upper %??% "NULL", "\n")
+      cat(" - max_changed: ", private$max_changed %??% "NULL", "\n")
+      cat(" - mu: ", private$mu %??% "NULL", "\n")
+      cat(" - termination_crit: ", private$termination_crit %??% "NULL", "\n")    
+      cat(" - n_generations: ", private$n_generations %??% "NULL", "\n")
+      cat(" - p_mut: ", private$p_mut %??% "NULL", "\n")
+      cat(" - p_mut_gen: ", private$p_mut_gen %??% "NULL", "\n")
+      cat(" - p_mut_use_orig: ", private$p_mut_use_orig %??% "NULL", "\n")
+      cat(" - p_rec: ", private$p_rec %??% "NULL", "\n")
+      cat(" - p_rec_gen: ", private$p_rec_gen %??% "NULL", "\n")
+      cat(" - weights: ", private$weights %??% "NULL", "\n")
     }
   )
 )
diff --git a/R/NICEClassif.R b/R/NICEClassif.R
@@ -197,10 +197,10 @@ NICEClassif = R6::R6Class("NICEClassif", inherit = CounterfactualMethodClassif,
     },
 
     print_parameters = function() {
-      cat(" - finish_early: ", private$finish_early, "\n")
-      cat(" - optimization: ", private$optimization, "\n")
-      cat(" - return_multiple: ", private$return_multiple, "\n")
-      cat(" - x_nn_correct: ", private$x_nn_correct, "\n")
+      cat(" - finish_early: ", private$finish_early %??% "NULL", "\n")
+      cat(" - optimization: ", private$optimization %??% "NULL", "\n")
+      cat(" - return_multiple: ", private$return_multiple %??% "NULL", "\n")
+      cat(" - x_nn_correct: ", private$x_nn_correct %??% "NULL", "\n")
     }
   )
 )
diff --git a/R/NICERegr.R b/R/NICERegr.R
@@ -206,10 +206,10 @@ NICERegr = R6::R6Class("NICERegr",
       res$counterfactuals
     },
     print_parameters = function() {
-      cat(" - finish_early: ", private$finish_early, "\n")
-      cat(" - optimization: ", private$optimization, "\n")
-      cat(" - return_multiple: ", private$return_multiple, "\n")
-      cat(" - x_nn_correct: ", private$x_nn_correct, "\n")
+      cat(" - finish_early: ", private$finish_early %??% "NULL", "\n")
+      cat(" - optimization: ", private$optimization %??% "NULL", "\n")
+      cat(" - return_multiple: ", private$return_multiple %??% "NULL", "\n")
+      cat(" - x_nn_correct: ", private$x_nn_correct %??% "NULL", "\n")
     }
   )
 )
diff --git a/R/WhatIfClassif.R b/R/WhatIfClassif.R
@@ -102,7 +102,7 @@ WhatIfClassif = R6::R6Class("WhatIfClassif", inherit = CounterfactualMethodClass
     },
 
     print_parameters = function() {
-      cat(" - n_counterfactuals: ", private$n_counterfactuals)
+      cat(" - n_counterfactuals: ", private$n_counterfactuals %??% "NULL")
     }
   )
 )
diff --git a/R/WhatIfRegr.R b/R/WhatIfRegr.R
@@ -103,7 +103,7 @@ WhatIfRegr = R6::R6Class("WhatIfRegr", inherit = CounterfactualMethodRegr,
     },
 
     print_parameters = function() {
-      cat(" - n_counterfactuals: ", private$n_counterfactuals)
+      cat(" - n_counterfactuals: ", private$n_counterfactuals %??% "NULL")
     }
   )
 )