nodeInstr_nClass and calcInstr_nClass

Author: perrydv

nCompiler/NAMESPACE

@@ -7,6 +7,7 @@ export(NCinternals)
 export(NFinternals)
 export(argType2Cpp)
 export(build_compiled_nClass)
+export(calcInstr_nClass)
 export(cloglog)
 export(check_Rcpp_for_nCompiler)
 export(compileNimble)
@@ -81,6 +82,7 @@ export(nList)
 export(nLogical)
 export(nMatrix)
 export(nodeFxnBase_nClass)
+export(nodeInstr_nClass)
 export(nArray)
 export(nOptions)
 export(nParse)

nCompiler/R/nimbleModels.R

@@ -14,6 +14,34 @@
 
 ## a model will inherit from model_nClass
 
+nodeInstr_nClass <- nClass(
+  classname = "nodeInstr_nClass",
+  Cpublic = list(
+    methodInstr = 'integerVector',
+    indsInstrVec = "nList('integerVector')"
+  ),
+  predefined = quote(system.file(file.path("include","nCompiler", "predefined_nClasses"), package="nCompiler") |>
+               file.path("nodeInstr_nClass")),
+  compileInfo=list(interface="full",
+                   createFromR = TRUE#,
+                   #predefined_output_dir = "nodeInstr_nClass"
+                   )
+)
+
+calcInstr_nClass <- nClass(
+  classname = "calcInstr_nClass",
+  Cpublic = list(
+    nodeIndex = 'integerScalar',
+    nodeInstrVec = "nList('nodeInstr_nClass')"
+  ),
+  predefined = quote(system.file(file.path("include","nCompiler", "predefined_nClasses"), package="nCompiler") |>
+               file.path("calcInstr_nClass")),
+  compileInfo=list(interface="full",
+                   createFromR = TRUE#,
+                   #predefined_output_dir = "calcInstr_nClass"
+                   )
+)
+
 nodeFxnBase_nClass <- nClass(
   classname = "nodeFxnBase_nClass",
   Cpublic = list(
@@ -24,7 +52,7 @@ nodeFxnBase_nClass <- nClass(
     ),
     calculate = nFunction(
       name = "calculate",
-      function(to_do = integer(1)) {return(0); returnType(double())},
+      function(nodeInstr = 'nodeInstr_nClass') {return(0); returnType(double())},
       compileInfo = list(virtual=TRUE)
     )
   ),
@@ -48,7 +76,8 @@ modelBase_nClass <- nClass(
     ),
     calculate = nFunction(
         name = "calculate",
-        function(nodes=SEXP()) {cppLiteral('Rprintf("modelBase_nClass calculate (should not see this)\\n");')},
+        function(calcInstr='calcInstr_nClass') {cppLiteral('Rprintf("modelBase_nClass calculate (should not see this)\\n");'); return(0)},
+        returnType = 'numericScalar',
         compileInfo = list(virtual=TRUE)
     )
   ),

nCompiler/R/symbolTable.R

@@ -189,7 +189,7 @@ symbolTBD <- R6::R6Class(
       stop("Trying to generate a C++ type from a TBD type ('",
            self$name,
            "' of type '",
-           self$type, "'.")
+           self$type, "').")
     }
   )
 )

nCompiler/R/typeDeclarations.R

@@ -1,4 +1,3 @@
-
 ## each entry in the typeDeclarationList
 ## gives a function to convert the arguments of a
 ## type declaration into a symbol object.
@@ -237,7 +236,7 @@ typeDeclarationList <- list(
   RcppFunction = function(...) {
     symbolRcppType$new(RcppType = "Rcpp::Function", ...)
   },
-  
+
   ## RcppEigen RcppTypes
   RcppEigenMatrixXd = function(...) {
     symbolRcppType$new(RcppType = "Eigen::MatrixXd", ...)
@@ -257,7 +256,7 @@ typeDeclarationList <- list(
   RcppEigenVectorXcd = function(...) {
     symbolRcppType$new(RcppType = "Eigen::VectorXcd", ...)
   },
-  
+
   ## Sparse types
   nSparseMatrix = function(value,
                            ...,
@@ -290,7 +289,7 @@ typeDeclarationList <- list(
            nDim <= 6))
       stop(paste0("Invalid number of dimensions used to declare a.nCompiler ",
                   "argument.  Dimensions from 0-6 are allowed."),
-           call. = FALSE)  
+           call. = FALSE)
     nType(scalarType, nDim)
   },
   CppVar = function(...) { # symbolBaseArgs will be passed to symbolBase$initialize
@@ -351,12 +350,12 @@ argType2symbol <- function(argType,
   ## allow e.g. 'scalarInteger' to become scalarInteger()
   if(is.name(typeToUse))
     typeToUse <- as.call(list(typeToUse))
-  
+
   ## argType could be a blank
   if(is.name(argType))
     if(as.character(argType)=="")
       argType <- NULL
-  
+
   ans <- try({
     ## TO-DO: Case 1: It is a nType object
     ##    To be implemented
@@ -427,8 +426,8 @@ argType2symbol <- function(argType,
       ## Case 3: It is a nClass type or possibly other "to-be-determined" type.
       ## We defer type lookup until compiler stage labelAbstractTypes
       if(inputAsCharacter) {
-        symbol <- symbolTBD$new(name = name, 
-                                type = funName, 
+        symbol <- symbolTBD$new(name = name,
+                                type = funName,
                                 isArg = isArg)
       } else {
         ## Case 4: Type can be determined by evaluating the default
@@ -461,7 +460,7 @@ argType2symbol <- function(argType,
          call.=FALSE)
   }
   if(isTRUE(symbol$isRef)) {
-    
+
   }
   nErrorEnv$.isRef_has_been_set <- FALSE
   nErrorEnv$.isBlockRef_has_been_set <- FALSE
@@ -515,7 +514,7 @@ argTypeList2symbolTable <- function(argTypeList,
   }
   if(is.null(names(isArg)))
     names(isArg) <- names(argTypeList)
-  
+
   ## Check that isRef is valid
   if(!is.list(isRef)) {
     ok <- FALSE
@@ -617,11 +616,19 @@ resolveOneTBDsymbol <- function(symbol, env = parent.frame()) {
                              NCgenerator = candidate)
       return(newSym)
     }
+  } else if(inherits(symbol, "symbolNlist")) {
+    elementSym <- symbol$elementSym
+    if(inherits(elementSym, "symbolTBD")) {
+      elementSym <- resolveOneTBDsymbol(elementSym, env)
+      newSym <- symbol$clone(deep=TRUE)
+      newSym$elementSym <- elementSym
+      return(newSym)
+    }
   }
   symbol #return unmodified symbol if nothing to do
 }
 
-resolveTBDsymbols <- function(symTab, 
+resolveTBDsymbols <- function(symTab,
                               env = parent.frame()) {
   for(i in seq_along(symTab$symbols)) {
     symTab$symbols[[i]] <- resolveOneTBDsymbol(symTab$symbols[[i]], env)

nCompiler/inst/include/nCompiler/predefined_nClasses/calcInstr_nClass/calcInstr_nClass_copyFiles.txt

@@ -0,0 +1,46 @@
+/* OPENER (Do not edit this comment) */
+#ifndef __calcInstr_nClass_CPP
+#define __calcInstr_nClass_CPP
+/* BODY (Do not edit this comment) */
+#ifndef R_NO_REMAP
+#define R_NO_REMAP
+#endif
+#include <iostream>
+#include "calcInstr_nClass_c_.h"
+using namespace Rcpp;
+// [[Rcpp::plugins(nCompiler_Eigen_plugin)]]
+// [[Rcpp::depends(RcppParallel)]]
+// [[Rcpp::depends(nCompiler)]]
+// [[Rcpp::depends(Rcereal)]]
+
+      calcInstr_nClass::calcInstr_nClass (  ) {
+RESET_EIGEN_ERRORS
+}
+
+// [[Rcpp::export(name = "new_calcInstr_nClass")]]
+    SEXP  new_calcInstr_nClass (  ) {
+RESET_EIGEN_ERRORS
+return CREATE_NEW_NCOMP_OBJECT(calcInstr_nClass);;
+}
+
+// [[Rcpp::export(name = "set_CnClass_env_new_calcInstr_nClass")]]
+    void  set_CnClass_env_calcInstr_nClass ( SEXP env ) {
+RESET_EIGEN_ERRORS
+SET_CNCLASS_ENV(calcInstr_nClass, env);;
+}
+
+// [[Rcpp::export(name = "get_CnClass_env_new_calcInstr_nClass")]]
+    Rcpp::Environment  get_CnClass_env_calcInstr_nClass (  ) {
+RESET_EIGEN_ERRORS
+return GET_CNCLASS_ENV(calcInstr_nClass);;
+}
+
+NCOMPILER_INTERFACE(
+calcInstr_nClass,
+NCOMPILER_FIELDS(
+field("nodeIndex", &calcInstr_nClass::nodeIndex),
+field("nodeInstrVec", &calcInstr_nClass::nodeInstrVec)
+),
+NCOMPILER_METHODS()
+)
+#endif

nCompiler/inst/include/nCompiler/predefined_nClasses/calcInstr_nClass/calcInstr_nClass_cppContent.cpp

@@ -0,0 +1 @@
+calcInstr_nClass_c_

nCompiler/inst/include/nCompiler/predefined_nClasses/calcInstr_nClass/calcInstr_nClass_filebase.txt

@@ -0,0 +1,24 @@
+/* OPENER (Do not edit this comment) */
+#ifndef __calcInstr_nClass_H
+#define __calcInstr_nClass_H
+/* BODY (Do not edit this comment) */
+#ifndef R_NO_REMAP
+#define R_NO_REMAP
+#endif
+#include <Rinternals.h>
+
+class calcInstr_nClass : public interface_resolver< genericInterfaceC<calcInstr_nClass> >, public loadedObjectHookC<calcInstr_nClass> {
+public:
+      calcInstr_nClass (  ) ;
+  int nodeIndex;
+  nList<std::shared_ptr<nodeInstr_nClass> > nodeInstrVec;
+};
+
+    SEXP  new_calcInstr_nClass (  ) ;
+
+    void  set_CnClass_env_calcInstr_nClass ( SEXP env ) ;
+
+    Rcpp::Environment  get_CnClass_env_calcInstr_nClass (  ) ;
+
+
+#endif

nCompiler/inst/include/nCompiler/predefined_nClasses/calcInstr_nClass/calcInstr_nClass_hContent.h

@@ -0,0 +1,7 @@
+list(saved_at = structure(1762351302.27482, class = c("POSIXct", 
+"POSIXt")), packet_name = "calcInstr_nClass", elements = c("preamble", 
+"cppContent", "hContent", "filebase", "post_cpp_compiler", "copyFiles"
+), files = list(preamble = "calcInstr_nClass_preamble.cpp", cppContent = "calcInstr_nClass_cppContent.cpp", 
+    hContent = "calcInstr_nClass_hContent.h", filebase = "calcInstr_nClass_filebase.txt", 
+    post_cpp_compiler = "calcInstr_nClass_post_cpp_compiler.txt", 
+    copyFiles = "calcInstr_nClass_copyFiles.txt"))