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.

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

Group entity #175

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open

Group entity #175

wants to merge 32 commits into from

Commits on May 2, 2022

  1. Added structure for group entity

    Adding global group entity:
    - Added necessary group.py files
    - Changed all necessary files (e.g. __init__)
    - Study scripts run smoothly (more testing)
    - So far no functionality to group (is mostly copy of social system)
    zugnachpankow committed May 2, 2022
    Configuration menu
    Copy the full SHA
    d89dd45 View commit details
    Browse the repository at this point in the history
  2. Update group.py

    Added a possible group_network logic
    zugnachpankow committed May 2, 2022
    Configuration menu
    Copy the full SHA
    ffc4927 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. social_system

    zugnachpankow committed May 13, 2022
    Configuration menu
    Copy the full SHA
    7aebe13 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2022

  1. typo cleanup

    minor typo and some todos
    zugnachpankow committed May 31, 2022
    Configuration menu
    Copy the full SHA
    710242a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2022

  1. Fix Social Update

    had error in runner:
    TypeError: 'dict_keyiterator' object cannot be interpreted as an integer
    [...]
    in numpy.random.mtrand.RandomState.choice ValueError: a must be 1-dimensional or an integer
    File "C:\Users\bigma\PycharmProjects\pycopancore\pycopancore\model_components\exploit_social_learning\implementation\culture.py", line 42, in social_update
        agent_j = np.random.choice(self.acquaintance_network.neighbors(agent_i))
    with (self.acquaintance_network.neighbors(agent_i)) being
    <dict_keyiterator object at 0x00000226F0049F90>
    
    FIX:
    extracting list from key with list()
    
    agent_j = np.random.choice(list(self.acquaintance_network.neighbors(agent_i)))
    zugnachpankow committed Jun 1, 2022
    2 Configuration menu
    Copy the full SHA
    1ffd331 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2022

  1. Implementing Individual to Group relationships via a group_membership…

    …_network. Error while adding group to a culture (group needs to "live" somewhere, similar to cells for individuals that then give memberships to worlds and so on.
    zugnachpankow committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    c0994c4 View commit details
    Browse the repository at this point in the history
  2. Implement Network Solution for Group Memberships

    Using an directed from Individual to Group Network to handle n to n group memberships.
    zugnachpankow committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    2895209 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c473e1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    284b877 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fbb26f6 View commit details
    Browse the repository at this point in the history
  6. little fix

    zugnachpankow committed Jun 8, 2022
    Configuration menu
    Copy the full SHA
    bdeb128 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2022

  1. Configuration menu
    Copy the full SHA
    9747ce5 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2022

  1. Configuration menu
    Copy the full SHA
    032528c View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. - Change group from living in World to living in Culture

    - Add visualisation of layered group network in run_group_test_seven_dwarfs.py
    - Fix minor issues
    zugnachpankow committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    b3bc2c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Configuration menu
    Copy the full SHA
    4019e10 View commit details
    Browse the repository at this point in the history
  2. Added structure for group entity

    Adding global group entity:
    - Added necessary group.py files
    - Changed all necessary files (e.g. __init__)
    - Study scripts run smoothly (more testing)
    - So far no functionality to group (is mostly copy of social system)
    zugnachpankow committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    30409da View commit details
    Browse the repository at this point in the history
  3. Update group.py

    Added a possible group_network logic
    zugnachpankow committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    03ff3a0 View commit details
    Browse the repository at this point in the history
  4. social_system

    zugnachpankow committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    9b4aaa9 View commit details
    Browse the repository at this point in the history
  5. typo cleanup

    minor typo and some todos
    zugnachpankow committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    f088423 View commit details
    Browse the repository at this point in the history
  6. Implementing Individual to Group relationships via a group_membership…

    …_network. Error while adding group to a culture (group needs to "live" somewhere, similar to cells for individuals that then give memberships to worlds and so on.
    zugnachpankow committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    329ab84 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    696eb74 View commit details
    Browse the repository at this point in the history
  8. little fix

    zugnachpankow committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    75580f4 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    244a601 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    53f58d9 View commit details
    Browse the repository at this point in the history
  11. - Change group from living in World to living in Culture

    - Add visualisation of layered group network in run_group_test_seven_dwarfs.py
    - Fix minor issues
    zugnachpankow committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    b602e71 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    07035ab View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    ae3024d View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

  1. - bypassed AttributeErrors in base implementation for group by gettin…

    …g world, environment and metabolism the group lives in via necessary object world that is passed in study script along with culture: M.Group(culture=culture, world=world)
    zugnachpankow committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    356df4b View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. Configuration menu
    Copy the full SHA
    76474cd View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. Configuration menu
    Copy the full SHA
    447b6b8 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. Configuration menu
    Copy the full SHA
    34904c6 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. resolve #175

    zugnachpankow committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    bf446bf View commit details
    Browse the repository at this point in the history