Skip to content

Harness creation improvements #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FabrizioSandri merged 8 commits into from
Jul 6, 2022
Merged

Harness creation improvements #5

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3367ba6
RInside static
FabrizioSandri Jun 10, 2022
4c3ec96
RcppDeepState_CharacterVector improved
FabrizioSandri Jun 10, 2022
bb6fe57
string generation improved
FabrizioSandri Jun 10, 2022
355f151
rand_size variable fixed, sometimes missing initialization
FabrizioSandri Jun 10, 2022
a835323
revert CharacterVector
FabrizioSandri Jun 30, 2022
389796d
IntegerVector size fix
FabrizioSandri Jun 30, 2022
a66ef99
NumericVector size fix
FabrizioSandri Jun 30, 2022
c3f5708
Merge branch 'master' into harness-creation-improvements
FabrizioSandri Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions inst/include/RcppDeepState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using namespace Rcpp;
using namespace arma;
using namespace deepstate;
int rand_size;

//default integer generation
int RcppDeepState_int(){
Expand Down Expand Up @@ -38,7 +37,7 @@ double RcppDeepState_double(double low,double high){

//default NumericVector generation
Rcpp::NumericVector RcppDeepState_NumericVector(){
rand_size = DeepState_IntInRange(0,100);
int rand_size = DeepState_IntInRange(0,100);
double missing_values[] = {DeepState_Double(),R_NaN,R_PosInf,R_NegInf,NA_REAL};
Rcpp::NumericVector rand_numvec(rand_size);
OneOf(
Expand All @@ -65,12 +64,12 @@ Rcpp::NumericVector RcppDeepState_NumericVector(int size,int low,int high){
Rcpp::NumericVector rand_numvec(size);
OneOf(
[&] {
for(int i = 0 ; i < rand_size;i++){
for(int i = 0 ; i < size;i++){
rand_numvec[i] = DeepState_DoubleInRange(low,high);
}
},
[&] {
for(int i = 0 ; i < rand_size - 1 ;i++){
for(int i = 0 ; i < size - 1 ;i++){
rand_numvec[i] = DeepState_DoubleInRange(low,high);
}
for(int i = 0 ; i < 5 ; i++){
Expand Down Expand Up @@ -109,12 +108,12 @@ Rcpp::IntegerVector RcppDeepState_IntegerVector(int size,int low,int high){
Rcpp::IntegerVector rand_intvec(size);
OneOf(
[&] {
for(int i = 0 ; i < rand_size;i++){
for(int i = 0 ; i < size;i++){
rand_intvec[i] = DeepState_IntInRange(low,high);
}
},
[&] {
for(int i = 0 ; i < rand_size ;i++){
for(int i = 0 ; i < size ;i++){
rand_intvec[i] = DeepState_IntInRange(low,high);
}
for(int i = 0 ; i < 2 ; i++){
Expand Down Expand Up @@ -197,7 +196,7 @@ Rcpp::CharacterVector RcppDeepState_CharacterVector(){
//default string generation
std::string RcppDeepState_string(){
std::string rand_string;
rand_string = DeepState_CStrUpToLen(26,"abcdefghijklmnopqrstuvwxyz");
rand_string = DeepState_CStrUpToLen(50,"abcdefghijklmnopqrstuvwxyz");
return rand_string;
}

Expand Down