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

Make count_ops() work with logic operations by creating a binary tree. #7303

Merged
merged 26 commits into from Apr 12, 2014
Merged

Make count_ops() work with logic operations by creating a binary tree. #7303

merged 26 commits into from Apr 12, 2014

Commits on Mar 19, 2014

  1. Make count_ops() work with logic operations by creating a binary tree… 

    …. Bug was that Logic functions are not the instance of sympy.core.expr.Expr due to which logic operation were actually skipping to "else" case.

Fixes #7010
    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    cefd428 View commit details
    Browse the repository at this point in the history

  2. Added tests of the logic functions for count_ops() function.

    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    5389065 View commit details
    Browse the repository at this point in the history

  3. Fixed a test case of Xor(x,y) = 2*AND + OR

    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    7000d9e View commit details
    Browse the repository at this point in the history

  4. Fixed the test case for Nand(x,y).count_ops(visual=True) = OR and Nor… 

    …(x,y).count_ops(visual=True) = AND
    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    3c5ba38 View commit details
    Browse the repository at this point in the history

  5. Removed the obsolete test case which was addressing the bug.

    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    07168de View commit details
    Browse the repository at this point in the history

  6. Included the case of logic function in the "else" case.

    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    25a9686 View commit details
    Browse the repository at this point in the history

  7. removed the XXX comment to report bug.

    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    d5abbd7 View commit details
    Browse the repository at this point in the history

  8. Removed the case for logic functions because it was contradicting wit… 

    …h every other function's ops which is Basic but not isinstance(expr,Expr)
    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    366f864 View commit details
    Browse the repository at this point in the history

  9. Final commit, added the logic function to be counted in count_ops()

    @sahilshekhawat
    sahilshekhawat committed Mar 19, 2014
    Configuration menu
    Copy the full SHA
    00604b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2014

  1. remove the else condition and added the is.Boolean condition to gener… 

    …al Basic instances.
    @sahilshekhawat
    sahilshekhawat committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    d374ed5 View commit details
    Browse the repository at this point in the history

  2. Removed redundant tests count_ops(Basic()) = S.zero

    @sahilshekhawat
    sahilshekhawat committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    d277512 View commit details
    Browse the repository at this point in the history

  3. Removed trailing whitespaces, will always check them first.

    @sahilshekhawat
    sahilshekhawat committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    dc6cf28 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2014

  1. Added the cases to handle the exception of True and False, who were b… 

    …ehaving as logic function.
    @sahilshekhawat
    sahilshekhawat committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    ee126ac View commit details
    Browse the repository at this point in the history

  2. Fixed the bug.

    @sahilshekhawat
    sahilshekhawat committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    b49c02c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/sympy/sympy

    @sahilshekhawat
    sahilshekhawat committed Mar 23, 2014
    Configuration menu
    Copy the full SHA
    2f7d1de View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2014

  1. Fix the bug due to which Basic() was counted as an operation and us… 

    …ed a better algo for parsing args.
    @sahilshekhawat
    sahilshekhawat committed Mar 28, 2014
    Configuration menu
    Copy the full SHA
    e1c8ea4 View commit details
    Browse the repository at this point in the history

  2. Added more tests which also include some complex ones.

    @sahilshekhawat
    sahilshekhawat committed Mar 28, 2014
    Configuration menu
    Copy the full SHA
    7adde66 View commit details
    Browse the repository at this point in the history

  3. removed extra spaces

    @sahilshekhawat
    sahilshekhawat committed Mar 28, 2014
    Configuration menu
    Copy the full SHA
    cc74cd8 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2014

  1. removed true and false and used not a.args is () instead … 

    …as suggested by aaron.
    @sahilshekhawat
    sahilshekhawat committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    80fd37a View commit details
    Browse the repository at this point in the history

  2. Replace "is" with "==" to check the conditions.

    @sahilshekhawat
    sahilshekhawat committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    912c0fd View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2014

  1. replaced 'is' with '=='

    @sahilshekhawat
    sahilshekhawat committed Apr 4, 2014
    Configuration menu
    Copy the full SHA
    9549f0b View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2014

  1. Added tests to include cases of logic functions given less arguments … 

    …than require
    @sahilshekhawat
    sahilshekhawat committed Apr 5, 2014
    Configuration menu
    Copy the full SHA
    37ba49b View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2014

  1. removed Basic and Tuple check

    @sahilshekhawat
    sahilshekhawat committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    4fbde7b View commit details
    Browse the repository at this point in the history

  2. Added more test related to Basic()

    @sahilshekhawat
    sahilshekhawat committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    9771a86 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2014

  1. Added logical test for TUPLE and removed duplicate tests

    @sahilshekhawat
    sahilshekhawat committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    5d3950d View commit details
    Browse the repository at this point in the history

  2. removed some tests which were showing bugs in logical functions.

    @sahilshekhawat
    sahilshekhawat committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    189c659 View commit details
    Browse the repository at this point in the history