restructure

statnet · Oct 8, 2024 · 5c958dc · 5c958dc
1 parent e19ca1f
commit 5c958dc
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 65 deletions.
diff --git a/src/MCMCDyn.c b/src/MCMCDyn.c
@@ -16,17 +16,6 @@
  should have (k,j) with k>j.
 *****************/
 
-SEXP kvint_to_SEXP(kvint v) {
-    int size = kv_size(v);
-    SEXP out = PROTECT(allocVector(INTSXP, size));
-    int *out_ptr = INTEGER(out);
-    for (int i = 0; i < size; i++) {
-        out_ptr[i] = kv_A(v, i);
-    }
-    UNPROTECT(1);
-    return out;
-}
-
 /*****************
  void MCMCDyn_wrapper
 

diff --git a/src/MCMCDyn.h b/src/MCMCDyn.h
@@ -17,10 +17,7 @@
 #include "tergm_model.h"
 #include "ergm_state.h"
 #include "changestats_lasttoggle.h"
-/*#include "diff_vect.h"*/
-
-#include "ergm_kvec.h"
-typedef kvec_t(int) kvint;
+#include "kvint.h"
 
 // TODO: This might be worth moving into a common "constants.h".
 typedef enum MCMCDynStatus_enum {

diff --git a/src/diff_vect.c b/src/diff_vect.c
diff --git a/src/diff_vect.h b/src/diff_vect.h
diff --git a/src/kvint.c b/src/kvint.c
@@ -0,0 +1,12 @@
+#include "kvint.h"
+
+SEXP kvint_to_SEXP(kvint v) {
+    int size = kv_size(v);
+    SEXP out = PROTECT(allocVector(INTSXP, size));
+    int *out_ptr = INTEGER(out);
+    for (int i = 0; i < size; i++) {
+        out_ptr[i] = kv_A(v, i);
+    }
+    UNPROTECT(1);
+    return out;
+}
diff --git a/src/kvint.h b/src/kvint.h
@@ -0,0 +1,10 @@
+#ifndef INCLUDE_SRC_KVINT_H_
+#define INCLUDE_SRC_KVINT_H_
+
+#include <Rinternals.h>
+#include "ergm_kvec.h"
+
+typedef kvec_t(int) kvint;
+SEXP kvint_to_SEXP(kvint v);
+
+#endif  // INCLUDE_SRC_KVINT_H_