From f2b407dc2379027e51a76954bbe195996e282d46 Mon Sep 17 00:00:00 2001
From: Alex Zwanenburg <alexander.zwanenburg@nct-dresden.de>
Date: Fri, 3 Jan 2025 18:17:28 +0100
Subject: [PATCH] Revised how names are created and set for familiarEnsemble
 and familiarModel objects.

---
 R/FamiliarEnsemble.R | 12 +++++-------
 R/FamiliarModel.R    | 11 ++++-------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/R/FamiliarEnsemble.R b/R/FamiliarEnsemble.R
index bca259bc..3d37dbed 100644
--- a/R/FamiliarEnsemble.R
+++ b/R/FamiliarEnsemble.R
@@ -911,14 +911,11 @@ setMethod(
   "get_object_name",
   signature(object = "familiarEnsemble"),
   function(object, abbreviated = FALSE) {
-    # Extract data and run id
-    ensemble_data_id <- object@run_table$ensemble_data_id
-    ensemble_run_id <- object@run_table$ensemble_run_id
 
     if (abbreviated) {
       # Create an abbreviated name
       model_name <- paste0(
-        "ensemble", ".", ensemble_data_id, ".", ensemble_run_id
+        "ensemble", ".", object@data_id, ".", object@run_id
       )
       
     } else {
@@ -927,10 +924,9 @@ setMethod(
         learner = object@learner,
         vimp_method = object@vimp_method,
         project_id = object@project_id,
-        data_id = ensemble_data_id,
-        run_id = ensemble_run_id,
+        data_id = object@data_id,
+        run_id = object@run_id,
         object_type = "familiarEnsemble",
-        is_ensemble = TRUE,
         with_extension = FALSE
       )
     }
@@ -939,6 +935,8 @@ setMethod(
   }
 )
 
+
+
 # model_is_trained (ensemble) --------------------------------------------------
 setMethod(
   "model_is_trained",
diff --git a/R/FamiliarModel.R b/R/FamiliarModel.R
index fc5b3b44..5ce4b6ea 100644
--- a/R/FamiliarModel.R
+++ b/R/FamiliarModel.R
@@ -758,13 +758,10 @@ setMethod(
   "get_object_name",
   signature(object = "familiarModel"),
   function(object, abbreviated = FALSE) {
-    # Extract data and run id
-    model_data_id <- tail(object@run_table, n = 1L)$data_id
-    model_run_id <- tail(object@run_table, n = 1L)$run_id
-
+    
     if (abbreviated) {
       # Create an abbreviated name
-      model_name <- paste0("model.", model_data_id, ".", model_run_id)
+      model_name <- paste0("model.", object@data_id, ".", object@run_id)
       
     } else {
       # Create the full name of the model
@@ -772,8 +769,8 @@ setMethod(
         learner = object@learner,
         vimp_method = object@vimp_method,
         project_id = object@project_id,
-        data_id = model_data_id,
-        run_id = model_run_id,
+        data_id = object@data_id,
+        run_id = object@run_id,
         object_type = "familiarModel",
         with_extension = FALSE
       )