Adding New Tests, Documentation and Bug Fixes

.Rbuildignore

@@ -5,12 +5,12 @@ Trial
 materials
 test_model
 tests/testthat/test_data/language_models
-test/testthat/test_data/tmp
-test/testthat/tmp
-test/testthat/tmp_full_models
-test/testthat/test_data/bert/checkpoints
-test/testthat/test_data/longformer/checkpoints
-test/testthat/test_data/roberta/checkpoints
+tests/testthat/test_data/tmp
+tests/testthat/tmp
+tests/testthat/tmp_full_models
+tests/testthat/test_data/bert/checkpoints
+tests/testthat/test_data/longformer/checkpoints
+tests/testthat/test_data/roberta/checkpoints
 .h5
 .git
 .gitignore

.gitignore

@@ -10,10 +10,10 @@ language_models
 .Rhistory
 *.h5
 tests/testthat/test_data/language_models/
-test/testthat/test_data/tmp/
-test/testthat/tmp/
-test/testthat/tmp_full_models/
-test/testthat/test_data/bert/
-test/testthat/test_data/roberta/
-test/testthat/test_data/longformer/
+tests/testthat/test_data/tmp/
+tests/testthat/tmp/
+tests/testthat/tmp_full_models/
+tests/testthat/test_data/bert/
+tests/testthat/test_data/roberta/
+tests/testthat/test_data/longformer/
 cran-comments.md

R/saving_and_loading.R

@@ -16,14 +16,14 @@ load_ai_model<-function(model_dir){
 
     loaded_model<-get(x=name_interface)
 
-    if(methods::is(model,"TextEmbeddingClassifierNeuralNet")){
-      loaded_model$load_model(model_dir)
-    } else if (methods::is(model,"TextEmbeddingModel")){
+    if(methods::is(loaded_model,"TextEmbeddingClassifierNeuralNet")){
       loaded_model$load_model(model_dir)
+    } else if (methods::is(loaded_model,"TextEmbeddingModel")){
+      if(loaded_model$basic_components$method%in%c("glove_cluster","lda")==FALSE){
+        loaded_model$load_model(model_dir)
+      }
     }
-
     return(loaded_model)
-
   } else {
     stop("There is no file r_interface.rda in the selected directory")
   }
@@ -37,7 +37,7 @@ load_ai_model<-function(model_dir){
 #'@param model_dir Path to the directory where the should model is stored.
 #'@param save_format Format for saving the model. \code{"tf"} for SavedModel
 #'or \code{"h5"} for HDF5. Only relevant if the model is of class \link{TextEmbeddingClassifierNeuralNet}.
-#'It is recommended to use \code{"tf}.
+#'It is recommended to use \code{"tf"}.
 #'
 #'@family Saving and Loading
 #'
@@ -57,16 +57,12 @@ save_ai_model<-function(model,model_dir,save_format="tf"){
     if(methods::is(model,"TextEmbeddingClassifierNeuralNet")){
       model$save_model(dir_path = final_model_dir_path,save_format=save_format)
     } else {
-      model$save_model(model_dir = final_model_dir_path)
+      if(model$basic_components$method%in%c("glove_cluster","lda")==FALSE){
+        model$save_model(model_dir = final_model_dir_path)
+      }
     }
-
-
-
   } else {
     stop("Function supports only objects of class TextEmbeddingClassifierNeuralNet or
          TextEmbeddingModel")
   }
-
-  methods::is(model,"TextEmbeddingModel")
-
 }

R/te_classifier_neuralnet_model.R

@@ -483,9 +483,9 @@ TextEmbeddingClassifierNeuralNet<-R6::R6Class(
       private$model_info$model_date=date()
 
       private$r_package_versions$aifeducation<-packageVersion("aifeducation")
-      private$r_package_versions$keras<-packageVersion("keras")
+      #private$r_package_versions$keras<-packageVersion("keras")
       private$r_package_versions$smotefamily<-packageVersion("smotefamily")
-      private$r_package_versions$bundle<-packageVersion("bundle")
+      #private$r_package_versions$bundle<-packageVersion("bundle")
 
       private$py_package_versions$tensorflow<-tf$version$VERSION
       private$py_package_versions$numpy<-np$version$short_version

_pkgdown.yml

@@ -22,6 +22,10 @@ reference:
 - contents:
   - has_concept("Installation and Configuration")
 
+- title: Saving and Loading
+- contents:
+  - has_concept("Saving and Loading")
+
 - title: Preparation
 - contents:
   - has_concept("Preparation")