Skip to content
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

Jump to bottom

Fix class of object returned by mixingmatrix method #54

Closed
mbojan opened this issue Jan 12, 2021 · 6 comments
Closed

Fix class of object returned by mixingmatrix method #54

mbojan opened this issue Jan 12, 2021 · 6 comments

Comments

@mbojan
Copy link
Member

mbojan commented Jan 12, 2021

As per statnet/network#32.
mbojan added a commit to mbojan/ergm.ego that referenced this issue Jan 21, 2021
@mbojan
Make mixingmatrix() return obj of class 'mixingmatrix'
a25c984 
It is now compatible with network::mixingmatrix.network().
References statnet/network#32 and statnet#54.
@krivit
Copy link
Member

krivit commented Jun 5, 2021

Was this ever merged into master?

@mbojan
Copy link
Member Author

mbojan commented Jun 12, 2021

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

@krivit
Copy link
Member

krivit commented Jun 18, 2021

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
Copy link
Member Author

mbojan commented Jun 18, 2021

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

@krivit
Copy link
Member

krivit commented Jun 19, 2021

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

@mbojan
Copy link
Member Author

mbojan commented Jun 19, 2021

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-*.

krivit pushed a commit to mbojan/ergm.ego that referenced this issue Jun 19, 2021
@mbojan @krivit
Make mixingmatrix() return obj of class 'mixingmatrix'
e7cc910 
It is now compatible with network::mixingmatrix.network().
References statnet/network#32 and statnet#54.
krivit pushed a commit to mbojan/ergm.ego that referenced this issue Jun 19, 2021
@mbojan @krivit
Make mixingmatrix() return obj of class 'mixingmatrix'
762616f 
It is now compatible with network::mixingmatrix.network().
References statnet/network#32 and statnet#54.
@krivit krivit closed this as completed in 3dc009e Jun 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@mbojan @krivit