Skip to content

Valued nodes #13

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

Open
duncan-clark wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Valued nodes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9618eac
valued nodes dev
duncan-clark Dec 23, 2024
1555ddc
valued nodes dev
duncan-clark Dec 23, 2024
c0b40a6
fixed tests"
duncan-clark Jan 7, 2025
890ab2c
sa
duncan-clark Jan 7, 2025
b173590
fixed tests, added intercept
duncan-clark Jan 10, 2025
e7fa0da
Merge branch 'fellstat:master' into valued_nodes
duncan-clark Jun 5, 2025
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
3 changes: 2 additions & 1 deletion R/ernm-fit.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ ernmFit <- function(sampler,
parinit=theta0,
rinit=1,
rmax=100,
parscale=rep(1,length(theta0)), minimize=FALSE,
parscale=rep(1,length(theta0)),
minimize=FALSE,
sample=sample,
theta0=theta0,
stats=stats))
Expand Down
4 changes: 4 additions & 0 deletions inst/include/Model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,8 @@ class Model : public ShallowCopyable{
void discreteVertexUpdateR(int vertex, std::string varName, int newValue){
if(vertex > net->size())
::Rf_error("vertex index is bigger than the size of the network");
if(vertex < 0)
::Rf_error("vertex index is negative in C++ end - did you enter 0 in R end?");
std::vector<std::string> vars = net->discreteVarNames();
int variable = -1;
for(int i=0;i<vars.size();i++){
Expand All @@ -547,6 +549,8 @@ class Model : public ShallowCopyable{
void continVertexUpdateR(int vertex, std::string varName, int newValue){
if(vertex > net->size())
::Rf_error("vertex index is bigger than the size of the network");
if(vertex < 0)
::Rf_error("vertex index is negative in C++ end - did you enter 0 in R end?");
std::vector<std::string> vars = net->continVarNames();
int variable = -1;
for(int i=0;i<vars.size();i++){
Expand Down
Loading