Merge pull request #53 from ApexRMS/ha-fixing-maxent-model

Ha fixing maxent model

Author: afilazzola

src/functions/0.4-CNN.r

@@ -530,7 +530,18 @@ loadCNNModel <- function(weights_path, metadata_path) {
   net$load_state_dict(sd)
 
   # Return the same structure you used elsewhere: model + metadata
-  c(list(model = net), metadata)
+  result <- list(
+    model = net,
+    vimp = metadata$vimp,
+    feature_names = metadata$feature_names,
+    cat_vars = metadata$cat_vars,
+    num_vars = metadata$num_vars,
+    cat_level_lengths = metadata$cat_level_lengths,
+    cat_levels = metadata$cat_levels,
+    embedding_dims = metadata$embedding_dims
+  )
+
+  return(result)
 }
 
 

src/functions/0.4-maxent.r

@@ -193,7 +193,7 @@ getMaxentModel <- function(allTrainData, nCores, isTuningOn) {
     cat_vars    = cat_vars,
     num_vars    = num_vars,
     cat_levels  = cat_levels,
-    predict_df  = predict_maxent_dataframe
+    predict_df  = predictMaxentDataframe
   ))
 
 }

src/functions/0.4-random-forest.r

@@ -161,7 +161,7 @@ getRandomForestModel <- function(allTrainData, nCores, isTuningOn) {
     set.seed(1)
     idx0 <- which(df$presence == "absence")
     idx1 <- which(df$presence == "presence")
-    k0 <- round(tune_nmax * length(idx0) / nrow(df))
+    k0 <- round(as.numeric(tune_nmax) * length(idx0) / nrow(df))
     k1 <- tune_nmax - k0
     tune_idx <- c(
       sample(idx0, min(k0, length(idx0))),