Renamed some of the C files, and moved the multinet API files to /inst/include .

krivit · krivit · commit 77ae8e2d1973 · 2026-03-14T17:30:45.000+11:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ergm.multi
-Version: 0.3.0-4248
-Date: 2026-03-12
+Version: 0.3.0-4254
+Date: 2026-03-14
 Title: Fit, Simulate and Diagnose Exponential-Family Models for Multiple or Multilayer Networks
 Authors@R: c(person(c("Pavel", "N."), "Krivitsky", role=c("aut","cre"), email="pavel@statnet.org", comment=c(ORCID="0000-0002-9101-3362")),
              person(c("Mark", "S."), "Handcock", role=c("ctb"), email="handcock@stat.ucla.edu"),
diff --git a/inst/include/ergm.multi_changestat_multinet.h b/inst/include/ergm.multi_changestat_multinet.h
@@ -13,7 +13,7 @@
 #include "ergm_edgetree.h"
 
 #include "ergm_edgetype_set_binary.h"
-#include "ergm.multi_changestat_multinet.h.template.do_not_include_directly.h"
+#include "inc/ergm.multi_changestat_multinet.h.template.do_not_include_directly.h"
 
 #define MN_IO_TAIL(sn, t) ((Vertex) ((sn)->smap[t]))
 #define MN_IO_HEAD(sn, h) ((Vertex) ((sn)->smap[h]))
diff --git a/inst/include/ergm.multi_wtchangestat_multinet.h b/inst/include/ergm.multi_wtchangestat_multinet.h
@@ -13,7 +13,7 @@
 #include "ergm_wtedgetree.h"
 
 #include "ergm_edgetype_set_double.h"
-#include "ergm.multi_changestat_multinet.h.template.do_not_include_directly.h"
+#include "inc/ergm.multi_changestat_multinet.h.template.do_not_include_directly.h"
 
 #define WtMN_IO_TAIL(sn, t) ((Vertex) ((sn)->smap[t]))
 #define WtMN_IO_HEAD(sn, h) ((Vertex) ((sn)->smap[h]))
diff --git a/inst/include/inc/ergm.multi_changestat_multinet.h.template.do_not_include_directly.h b/inst/include/inc/ergm.multi_changestat_multinet.h.template.do_not_include_directly.h
@@ -7,7 +7,7 @@
  *
  *  Copyright 2003-2025 Statnet Commons
  */
-#include "ergm.multi_changestat_multinet_common.do_not_include_directly.h"
+#include "inc/ergm.multi_changestat_multinet_common.do_not_include_directly.h"
 
 /* network-aware macros eponymous to ergm_changestat.h */
 /* These routines need a way to specify which of the subnetworks is
diff --git a/inst/include/inc/ergm.multi_changestat_multinet_common.do_not_include_directly.h b/inst/include/inc/ergm.multi_changestat_multinet_common.do_not_include_directly.h
diff --git a/src/changestats_multinet.c b/src/changestats_multinet.c
@@ -13,4 +13,4 @@
 #include "ergm_model.h"
 
 #include "ergm_edgetype_set_binary.h"
-#include "ergm.multi_changestat_multinet.c.template.do_not_include_directly.h"
+#include "changestats_multinet.c.template.do_not_include_directly.h"
diff --git a/src/changestats_multinet.c.template.do_not_include_directly.h b/src/changestats_multinet.c.template.do_not_include_directly.h
diff --git a/src/wtchangestats_multinet.c b/src/wtchangestats_multinet.c
@@ -13,4 +13,4 @@
 #include "ergm_wtmodel.h"
 
 #include "ergm_edgetype_set_double.h"
-#include "ergm.multi_changestat_multinet.c.template.do_not_include_directly.h"
+#include "changestats_multinet.c.template.do_not_include_directly.h"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Copyright 2003-2025 Statnet Commons`
`9`	`9`	`*/`
`10`		`-#include "ergm.multi_changestat_multinet_common.do_not_include_directly.h"`
	`10`	`+#include "inc/ergm.multi_changestat_multinet_common.do_not_include_directly.h"`
`11`	`11`
`12`	`12`	`/* network-aware macros eponymous to ergm_changestat.h */`
`13`	`13`	`/* These routines need a way to specify which of the subnetworks is`