further Module renamings

Author: eddelbuettel

inst/unitTests/cpp/Module.cpp

@@ -74,9 +74,9 @@ void clearWorld(ModuleWorld* w) {
     w->set("");
 }
 
-class Num{
+class ModuleNum{
 public:
-    Num() : x(0.0), y(0) {};
+    ModuleNum() : x(0.0), y(0) {};
 
     double getX() const { return x; }
     void setX(double value) { x = value; }
@@ -88,19 +88,19 @@ class Num{
     int y;
 };
 
-class Number{
+class ModuleNumber{
 public:
-    Number() : x(0.0), y(0) {};
+    ModuleNumber() : x(0.0), y(0) {};
 
     double x;
     int y;
 };
 
-class Randomizer {
+class ModuleRandomizer {
 public:
 
     // Randomizer() : min(0), max(1) {}
-    Randomizer(double min_, double max_) : min(min_), max(max_) {}
+    ModuleRandomizer(double min_, double max_) : min(min_), max(max_) {}
 
     NumericVector get(int n) {
         RNGScope scope;
@@ -111,28 +111,28 @@ class Randomizer {
     double min, max;
 };
 
-RCPP_EXPOSED_CLASS(Test)
-class Test{
+RCPP_EXPOSED_CLASS(ModuleTest)
+class ModuleTest {
 public:
     double value;
-    Test(double v) : value(v) {}
+    ModuleTest(double v) : value(v) {}
 private:
     // hiding those on purpose
     // we work by reference or pointers here. Not by copy.
-    Test(const Test& other);
-    Test& operator=(const Test&);
+    ModuleTest(const ModuleTest& other);
+    ModuleTest& operator=(const ModuleTest&);
 };
 
-double Test_get_x_const_ref(const Test& x) {
+double Test_get_x_const_ref(const ModuleTest& x) {
     return x.value;
 }
-double Test_get_x_ref(Test& x) {
+double Test_get_x_ref(ModuleTest& x) {
     return x.value;
 }
-double Test_get_x_const_pointer(const Test* x) {
+double Test_get_x_const_pointer(const ModuleTest* x) {
     return x->value;
 }
-double Test_get_x_pointer(Test* x) {
+double Test_get_x_pointer(ModuleTest* x) {
     return x->value;
 }
 
@@ -148,7 +148,7 @@ RCPP_MODULE(demoModule) {
     function("test_const_reference", test_const_reference);
     function("test_const", test_const);
 
-    class_<Test>("Test")
+    class_<ModuleTest>("ModuleTest")
         .constructor<double>()
         ;
 
@@ -161,25 +161,25 @@ RCPP_MODULE(demoModule) {
         .method("clear", &clearWorld)
         ;
 
-    class_<Num>("Num")
+    class_<ModuleNum>("ModuleNum")
         .constructor()
 
         // read and write property
-        .property("x", &Num::getX, &Num::setX)
+        .property("x", &ModuleNum::getX, &ModuleNum::setX)
 
         // read-only property
-        .property("y", &Num::getY)
+        .property("y", &ModuleNum::getY)
         ;
 
-    class_<Number>("Number")
+    class_<ModuleNumber>("ModuleNumber")
 
         .constructor()
 
         // read and write data member
-        .field("x", &Number::x)
+        .field("x", &ModuleNumber::x)
 
         // read only data member
-        .field_readonly("y", &Number::y)
+        .field_readonly("y", &ModuleNumber::y)
         ;
 
     function("Test_get_x_const_ref", Test_get_x_const_ref);
@@ -188,32 +188,31 @@ RCPP_MODULE(demoModule) {
     function("Test_get_x_pointer", Test_get_x_pointer);
 
 
-    class_<Randomizer>("Randomizer")
+    class_<ModuleRandomizer>("ModuleRandomizer")
         // No default: .default_constructor()
         .constructor<double,double>()
 
-        .method("get" , &Randomizer::get)
+        .method("get" , &ModuleRandomizer::get)
         ;
 }
 
 // [[Rcpp::export]]
-double attr_Test_get_x_const_ref(const Test& x) {
+double attr_Test_get_x_const_ref(const ModuleTest& x) {
     return x.value;
 }
 
 // [[Rcpp::export]]
-double attr_Test_get_x_ref(Test& x) {
+double attr_Test_get_x_ref(ModuleTest& x) {
     return x.value;
 }
 
 // [[Rcpp::export]]
-double attr_Test_get_x_const_pointer(const Test* x) {
+double attr_Test_get_x_const_pointer(const ModuleTest* x) {
     return x->value;
 }
 
 // [[Rcpp::export]]
-double attr_Test_get_x_pointer(Test* x) {
+double attr_Test_get_x_pointer(ModuleTest* x) {
     return x->value;
 }
 
-

inst/unitTests/runit.Module.R

@@ -46,7 +46,7 @@ if( .runThisTest && Rcpp:::capabilities()[["Rcpp modules"]] ) {
     }
 
     test.Module.exposed.class <- function(){
-        test <- new( Test, 3.0 )
+        test <- new( ModuleTest, 3.0 )
         checkEquals( Test_get_x_const_ref(test), 3.0 )
         checkEquals( Test_get_x_const_pointer(test), 3.0 )
         checkEquals( Test_get_x_ref(test), 3.0 )
@@ -59,7 +59,7 @@ if( .runThisTest && Rcpp:::capabilities()[["Rcpp modules"]] ) {
     }
 
     test.Module.property <- function(){
-        w <- new( Num )
+        w <- new( ModuleNum )
         checkEquals( w$x, 0.0 )
         checkEquals( w$y, 0L )
 
@@ -70,7 +70,7 @@ if( .runThisTest && Rcpp:::capabilities()[["Rcpp modules"]] ) {
     }
 
     test.Module.member <- function(){
-        w <- new( Number )
+        w <- new( ModuleNumber )
         checkEquals( w$x, 0.0 )
         checkEquals( w$y, 0L )
 
@@ -81,7 +81,7 @@ if( .runThisTest && Rcpp:::capabilities()[["Rcpp modules"]] ) {
     }
 
     test.Module.Constructor <- function() {
-        r <- new( Randomizer, 10.0, 20.0 )
+        r <- new( ModuleRandomizer, 10.0, 20.0 )
         set.seed(123)
         x10 <- runif(10, 10.0, 20.0)
         set.seed(123)

inst/unitTests/testRcppModule/R/zzz.R

@@ -5,7 +5,7 @@
 
 ## For R 2.15.1 and later this also works. Note that calling loadModule() triggers
 ## a load action, so this does not have to be placed in .onLoad() or evalqOnLoad().
-loadModule("NumEx", TRUE)
+loadModule("RcppModuleNumEx", TRUE)
 loadModule("RcppModuleWorld", TRUE)
 loadModule("stdVector", TRUE)
 

inst/unitTests/testRcppModule/src/Num.cpp

@@ -2,7 +2,7 @@
 //
 // Num.cpp: Rcpp R/C++ interface class library -- Rcpp Module example
 //
-// Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2015  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -21,9 +21,9 @@
 
 #include <Rcpp.h>
 
-class Num {                     // simple class with two private variables
+class RcppModuleNum {           // simple class with two private variables
 public:                         // which have a getter/setter and getter
-    Num() : x(0.0), y(0){} ;
+    RcppModuleNum() : x(0.0), y(0){} ;
 
     double getX() { return x ; }
     void setX(double value){ x = value ; }
@@ -35,17 +35,17 @@ class Num {                     // simple class with two private variables
     int y ;
 };
 
-RCPP_MODULE(NumEx){
+RCPP_MODULE(RcppModuleNumEx){
     using namespace Rcpp ;
 
-    class_<Num>( "Num" )
+    class_<RcppModuleNum>( "RcppModuleNum" )
 
         .default_constructor()
 
         // read and write property
-        .property( "x", &Num::getX, &Num::setX )
+        .property( "x", &RcppModuleNum::getX, &RcppModuleNum::setX )
 
         // read-only property
-        .property( "y", &Num::getY )
+        .property( "y", &RcppModuleNum::getY )
 	;
 }

inst/unitTests/testRcppModule/src/rcpp_module.cpp

@@ -35,11 +35,11 @@ void bla( ) {                   // no input or return but output side effect
 }
 
 void bla1(int x) {              // output reflecting a single input
-    Rprintf( "hello (x = %d)\n", x);
+    Rprintf("hello (x = %d)\n", x);
 }
 
 void bla2(int x, double y) {    // output reflecting two inputs
-    Rprintf( "hello (x = %d, y = %5.2f)\n", x, y);
+    Rprintf("hello (x = %d, y = %5.2f)\n", x, y);
 }