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

Reshape scatter mats #141

Merged

Commits on May 14, 2018

  1. Add setting xs.reshapeScatter; HomogUniv reshapes scatter matrices

    HomogUniv containers now reshape incoming scattering matrices
    depending upon the value of settings xs.reshapeScatter.
    Number of groups is inferred from the first value added
    to the object, and all incoming values are compared
    against this group structure. If the number of groups for
    the incoming value does not match the current group
    structure, a warning messages is raised, but the value
    is still stored.
    andrewjohnson committed May 14, 2018
    Copy the full SHA
    4a6e8e0 View commit details
    Browse the repository at this point in the history
  2. BranchingReader no longer stores empty arrays

    If no values are presented in a line, such as
        INF_REM 0
    then the branching reader will not attempt to
    store this variable. A debug messages is printed
    andrewjohnson committed May 14, 2018
    Copy the full SHA
    1e2e04a View commit details
    Browse the repository at this point in the history
  3. Rework test_containers to work with numpy arrays

    Upcoming and in-progress changes to containers.py
    work only if the values passed to our container
    objects are arrays, as the shape property is used
    to determine/compare group structure
    andrewjohnson committed May 14, 2018
    Copy the full SHA
    8886020 View commit details
    Browse the repository at this point in the history
  4. Fewer warnings printed for HomogUniv.addData; Convert incoming to array

    The HomogUniv container will now attempt to convert non-numpy
    array values to arrays. This is done because the method for
    determining number of groups relies upon the shape command.
    
    Fewer warnings are printed now for variables having different
    group structures. If an array comes in that should be converted
    to a matrix, it's shape will be different than the current group
    structure would indicate.
    andrewjohnson committed May 14, 2018
    Copy the full SHA
    d6aab95 View commit details
    Browse the repository at this point in the history
  5. WIP - test vectorized and reshaped scatter matrices

    andrewjohnson committed May 14, 2018
    Copy the full SHA
    41b4b8e View commit details
    Browse the repository at this point in the history
  6. Direct mapping from rc __setitem__ to setValue

    andrewjohnson committed May 14, 2018
    Copy the full SHA
    c2c3977 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    60de016 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2018

  1. Move rc.__setitem__ after setValue for direct mapping

    andrewjohnson committed May 15, 2018
    Copy the full SHA
    963f638 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    d7e20e9 View commit details
    Browse the repository at this point in the history