test commit to see if new Rcppexports/NAMESPACE combo will work

adalisan · adalisan · commit c479de31cdfd · 2017-06-21T21:09:39.000-04:00
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,3 @@
-useDynLib(RGraphM,.registration = TRUE, .fixes = "RGraphM_")
+useDynLib(RGraphM,.registration = TRUE)
 importFrom(Rcpp, evalCpp)
 export("run_graph_match")
-
-
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -2,6 +2,6 @@
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
 run_graph_match <- function(A, B, algorithm_params) {
-    .Call('RGraphM_run_graph_match', PACKAGE = 'RGraphM', A, B, algorithm_params)
+    .Call(RGraphM_run_graph_match, A, B, algorithm_params)
 }
 
diff --git a/src/graphm/algorithm.cpp b/src/graphm/algorithm.cpp
@@ -22,7 +22,7 @@
 algorithm::algorithm(std::string fconfig)
  : rpc(fconfig)
 {
-gm_ldh=NULL;dalpha_ldh=0;bnosymm=false;
+gm_ldh=NULL;dalpha_ldh=0;bnosymm=false;df_norm=0;N=0;cdesc_matrix='';cscore_matrix='';
 }
 algorithm::algorithm()
  : rpc()

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393`
`3`	`3`
`4`	`4`	`run_graph_match <- function(A, B, algorithm_params) {`
`5`		`- .Call('RGraphM_run_graph_match', PACKAGE = 'RGraphM', A, B, algorithm_params)`
	`5`	`+ .Call(RGraphM_run_graph_match, A, B, algorithm_params)`
`6`	`6`	`}`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`algorithm::algorithm(std::string fconfig)`
`23`	`23`	`: rpc(fconfig)`
`24`	`24`	`{`
`25`		`-gm_ldh=NULL;dalpha_ldh=0;bnosymm=false;`
	`25`	`+gm_ldh=NULL;dalpha_ldh=0;bnosymm=false;df_norm=0;N=0;cdesc_matrix='';cscore_matrix='';`
`26`	`26`	`}`
`27`	`27`	`algorithm::algorithm()`
`28`	`28`	`: rpc()`