Merge branch 'master' into 4.7

statnet · Oct 13, 2024 · 3522774 · 3522774
2 parents ff5681f + 04d2b70
commit 3522774
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/R/InitErgmTerm.R b/R/InitErgmTerm.R
@@ -3592,7 +3592,7 @@ InitErgmTerm.mm<-function (nw, arglist, ..., version=packageVersion("ergm")) {
 
   list(name = "mixmat",
        coef.names = coef.names,
-       inputs = c(symm+marg*2, attrval$row$valcodes, attrval$col$valcodes, unlist(levels2codes)),
+       iinputs = c(symm+marg*2, attrval$row$valcodes, attrval$col$valcodes, unlist(levels2codes)),
        dependence = FALSE,
        minval = 0)
 }

diff --git a/src/changestats.c b/src/changestats.c
@@ -2603,11 +2603,11 @@ C_CHANGESTAT_FN(c_meandeg) {
  General mixing matrix (mm) implementation.
 *****************/
 C_CHANGESTAT_FN(c_mixmat){
-  unsigned int symm = ((int)INPUT_PARAM[0]) & 1;
-  unsigned int marg = ((int)INPUT_PARAM[0]) & 2;
-  double *tx = INPUT_PARAM;
-  double *hx = BIPARTITE? INPUT_PARAM : INPUT_PARAM + N_NODES;
-  double *cells = BIPARTITE? INPUT_PARAM + N_NODES + 1: INPUT_PARAM + N_NODES*2 + 1;
+  unsigned int symm = IINPUT_PARAM[0] & 1;
+  unsigned int marg = IINPUT_PARAM[0] & 2;
+  int *tx = IINPUT_PARAM;
+  int *hx = BIPARTITE? IINPUT_PARAM : IINPUT_PARAM + N_NODES;
+  int *cells = BIPARTITE? IINPUT_PARAM + N_NODES + 1: IINPUT_PARAM + N_NODES*2 + 1;
 
   unsigned int diag = tx[tail]==tx[head] && hx[tail]==hx[head];
   for(unsigned int j=0; j<N_CHANGE_STATS; j++){

diff --git a/src/wtchangestats.c b/src/wtchangestats.c
@@ -1260,11 +1260,11 @@ WtS_CHANGESTAT_FN(s_transitiveweights_threshold){
  General mixing matrix (mm) implementation.
 *****************/
 WtC_CHANGESTAT_FN(c_mixmat_sum){
-  unsigned int symm = ((int)INPUT_PARAM[0]) & 1;
-  unsigned int marg = ((int)INPUT_PARAM[0]) & 2;
-  double *tx = INPUT_PARAM;
-  double *hx = BIPARTITE? INPUT_PARAM : INPUT_PARAM + N_NODES;
-  double *cells = BIPARTITE? INPUT_PARAM + N_NODES + 1: INPUT_PARAM + N_NODES*2 + 1;
+  unsigned int symm = IINPUT_PARAM[0] & 1;
+  unsigned int marg = IINPUT_PARAM[0] & 2;
+  int *tx = IINPUT_PARAM;
+  int *hx = BIPARTITE? IINPUT_PARAM : IINPUT_PARAM + N_NODES;
+  int *cells = BIPARTITE? IINPUT_PARAM + N_NODES + 1: IINPUT_PARAM + N_NODES*2 + 1;
 
   unsigned int diag = tx[tail]==tx[head] && hx[tail]==hx[head];
   for(unsigned int j=0; j<N_CHANGE_STATS; j++){
@@ -1278,11 +1278,11 @@ WtC_CHANGESTAT_FN(c_mixmat_sum){
 }
 
 WtC_CHANGESTAT_FN(c_mixmat_nonzero){
-  unsigned int symm = ((int)INPUT_PARAM[0]) & 1;
-  unsigned int marg = ((int)INPUT_PARAM[0]) & 2;
-  double *tx = INPUT_PARAM;
-  double *hx = BIPARTITE? INPUT_PARAM : INPUT_PARAM + N_NODES;
-  double *cells = BIPARTITE? INPUT_PARAM + N_NODES + 1: INPUT_PARAM + N_NODES*2 + 1;
+  unsigned int symm = IINPUT_PARAM[0] & 1;
+  unsigned int marg = IINPUT_PARAM[0] & 2;
+  int *tx = IINPUT_PARAM;
+  int *hx = BIPARTITE? IINPUT_PARAM : IINPUT_PARAM + N_NODES;
+  int *cells = BIPARTITE? IINPUT_PARAM + N_NODES + 1: IINPUT_PARAM + N_NODES*2 + 1;
 
   unsigned int diag = tx[tail]==tx[head] && hx[tail]==hx[head];
   for(unsigned int j=0; j<N_CHANGE_STATS; j++){