Skip to content

Port shared-partner changestats to the C++ term API #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Port shared-partner changestats to the C++ term API #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6bded4
Initial plan
Copilot Jul 1, 2026
da5f5ac
Port shared-partner changestats to C++
Copilot Jul 1, 2026
ac5ae73
Refactor SP helper templates
Copilot Jul 1, 2026
f13cb75
Remove obsolete SP header macros
Copilot Jul 1, 2026
fb3d747
Removed the no-longer-necessary mtp arguments.
krivit Jul 17, 2026
8f4e8f0
Made the dgwesp C++ code more consistent for different calculation ty…
krivit Jul 17, 2026
8a13eed
Removed some unnecessary templating.
krivit Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions src/MHproposals_triadic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,24 +134,10 @@ extern "C" MH_P_FN(Mp_SPDyad){
Dyad oldtd = kh_size(spcache), newtd = oldtd;


// The following is setting up to use macros developed for the *sp
// terms.
Rboolean edgeflag = nw(p.tail[0], p.head[0]);
int echange = edgeflag ? -1 : +1;
Vertex tail = p.tail[0], head = p.head[0];

#define sp_nonzero newtd += (L2 + echange != 0) - (L2 != 0);

switch(type){
case L2UTP: dspUTP_change(sp_nonzero, ); break;
case L2OTP: dspOTP_change(sp_nonzero, ); break;
case L2ITP: dspITP_change(sp_nonzero, ); break;
case L2OSP: dspOSP_change(sp_nonzero, ); break;
case L2ISP: dspISP_change(sp_nonzero, ); break;
default: error("In ergm:Mp_SPDyad(), an unsupported type of triad: %d.", type);
}

#undef sp_nonzero
if(type == L2RTP) error("In ergm:Mp_SPDyad(), an unsupported type of triad: %d.", type);
newtd += ergm::sp::dsp_nonzero_change(type, tail, head, nw, edgeflag, spcache);

// q(y | y*) / q(y* | y) = 1/TD(y*) / (1/TD(y)) = TD(y) / TD(y*)
p.logratio += log(oldtd) - log(newtd);
Expand Down
Loading
Loading