Distance term for ergm (Minkowski and spherical distances) - #660

Open

CarterButts wants to merge 23 commits into

statnet:masterfrom

CarterButts:master

Commits on Aug 3, 2026

These changes add the distance term to ergm; the package passes R CMD check,

CarterButts
authored and
krivit
committed
2c322bc
Changed the changestat function for distance from d_ to c_, added new

CarterButts
authored and
krivit
committed
f90cf9e
The tests weren't happy about a concept label.

CarterButts
authored and
krivit
committed
602c050
Forgot to roxygenize the last change. This completes it.

CarterButts
authored and
krivit
committed
934b827
Added the pow option to the distance term, and documented it. Added a test, as well. Seems to work fine, and passes tests.

CarterButts
authored and
krivit
committed
c1daceb
--Duplicate changestats.c history into changestat_spheredist.c
krivit
committed
b9e6dcd
--Restore changestats.c
krivit
committed
0dacc82
Move spheredist() from changestats.c into changestat_spheredist.c
krivit
committed
7550bce
--Set up 'changestat_spheredist.c' to be appended to the 'changestat.c' placeholder.
krivit
committed
6784e2f
--Set up 'changestat.c' to be appended to the 'changestat.c' placeholder.
krivit
committed
e372b29
--Append 'changestat_spheredist.c' to the 'changestat.c' placeholder.
krivit
committed
27a9e6a
Concatenate files 'changestat.c' 'changestat_spheredist.c' into 'changestat.c'.
krivit
committed
3b263a7
--Duplicate changestats.c history into changestats_distance.c
krivit
committed
e450f7d
--Restore changestats.c
krivit
committed
fc3a868
Copy c_distance() from changestats.c into changestats_distance.c
krivit
committed
7fc6000
--Set up 'changestats_distance.c' to be appended to the 'changestats_dyad_ind.c.template.do_not_include_directly.h' placeholder.
krivit
committed
bcd8812
--Set up 'changestats_dyad_ind.c.template.do_not_include_directly.h' to be appended to the 'changestats_dyad_ind.c.template.do_not_include_directly.h' placeholder.
krivit
committed
9d12e26
--Append 'changestats_distance.c' to the 'changestats_dyad_ind.c.template.do_not_include_directly.h' placeholder.
krivit
committed
56de99d

Commits on Aug 4, 2026

Navigation Menu

Uh oh!

Distance term for ergm (Minkowski and spherical distances) - #660

Distance term for ergm (Minkowski and spherical distances)#660
CarterButts wants to merge 23 commits into
statnet:masterfrom
CarterButts:master

Commits on Aug 3, 2026

These changes add the distance term to ergm; the package passes R CMD check,

Changed the changestat function for distance from d_ to c_, added new

The tests weren't happy about a concept label.

Forgot to roxygenize the last change. This completes it.

Added the pow option to the distance term, and documented it. Added a test, as well. Seems to work fine, and passes tests.

--Duplicate changestats.c history into changestat_spheredist.c

--Restore changestats.c

Move spheredist() from changestats.c into changestat_spheredist.c

--Set up 'changestat_spheredist.c' to be appended to the 'changestat.c' placeholder.

--Set up 'changestat.c' to be appended to the 'changestat.c' placeholder.

--Append 'changestat_spheredist.c' to the 'changestat.c' placeholder.

Concatenate files 'changestat.c' 'changestat_spheredist.c' into 'changestat.c'.

--Duplicate changestats.c history into changestats_distance.c

--Restore changestats.c

Copy c_distance() from changestats.c into changestats_distance.c

--Set up 'changestats_distance.c' to be appended to the 'changestats_dyad_ind.c.template.do_not_include_directly.h' placeholder.

--Set up 'changestats_dyad_ind.c.template.do_not_include_directly.h' to be appended to the 'changestats_dyad_ind.c.template.do_not_include_directly.h' placeholder.

--Append 'changestats_distance.c' to the 'changestats_dyad_ind.c.template.do_not_include_directly.h' placeholder.

Commits on Aug 4, 2026

Concatenate files 'changestats_dyad_ind.c.template.do_not_include_directly.h' 'changestats_distance.c' into 'changestats_dyad_ind.c.template.do_not_include_directly.h'.

Added valued distance() term initializer.

Commits on Aug 21, 2026

In the distance() term example, replaced \dontrun{} with \donttest{}.

Commits on Aug 22, 2026

Bumped the expected number of valued terms in the tests.

Commits on Sep 10, 2026

Merge branch 'master' into dist_term