statnet / ergm.ego

Fit, Simulate and Diagnose Exponential-Family Random Graph Models to Egocentrically Sampled Network Data https://statnet.org
Other
14 stars 4 forks source link

Fix class of object returned by mixingmatrix method #54

Closed mbojan closed 3 years ago

mbojan commented 3 years ago

As per statnet/network#32.

krivit commented 3 years ago

Was this ever merged into master?

mbojan commented 3 years ago

I hoped to address #54 and #55 in one go, but let's make smaller steps instead...

krivit commented 3 years ago

Well, if this doesn't get resolved in the next day or two, it's not going into 0.9, since the workshop is in 10 days.

mbojan commented 3 years ago

The merge leads to several conflicts. It was not clear to me why. I'll try before the release. Otherwise next cycle.

krivit commented 3 years ago

Thanks! Maybe make a PR so that I could take a look as well?

mbojan commented 3 years ago

It seems I fixed #54 (which is trivial) on the branch but did not merge/PR it because of the conflicts. I guess they are because of the grand merge that happen in the mean time.

I'll have a look in 12hrs. I will add you @krivit to my fork so you can have a look (just in case). There are two branches i54-* and i55-*.