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

Max #2

Open
wants to merge 27 commits into
base: max
Choose a base branch
from
Open

Max #2

wants to merge 27 commits into from

Commits on Dec 5, 2013

  1. Added table of truth to third test

    @SammyVimes
    SammyVimes committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    9405d0f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from aivel/sem 

    Merge pull request from Max
    @SammyVimes
    SammyVimes committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    42bf237 View commit details
    Browse the repository at this point in the history

  3. Merge from origin

    @SammyVimes
    SammyVimes committed Dec 5, 2013
    Configuration menu
    Copy the full SHA
    5d2252e View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2013

  1. Merge pull request #3 from SammyVimes/sem 

    Sem
    @SammyVimes
    SammyVimes committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    c26aa1a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from SammyVimes/master 

    move master to edik
    @SammyVimes
    SammyVimes committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    0227a36 View commit details
    Browse the repository at this point in the history

  3. Major changes! 

    FIXED ERROR with KNF, DNF and PARSER;
Implemented Jegalkin Polynomial converter
    @SammyVimes
    SammyVimes committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    e13c797 View commit details
    Browse the repository at this point in the history

  4. Fixed error with constants in parser

    @SammyVimes
    SammyVimes committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    466a285 View commit details
    Browse the repository at this point in the history

  5. 123

    @SammyVimes
    SammyVimes committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    bd46c7e View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/sem' into edik 

    Conflicts:
	src/com/danilov/bool4j/test/Test5.java
	src/com/danilov/converter/JPolynomConverter.java
	src/ru/matlog/bool4j/closures/ClosureClasses.java
    @SammyVimes
    SammyVimes committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    72ef451 View commit details
    Browse the repository at this point in the history

  7. merge

    @SammyVimes
    SammyVimes committed Dec 10, 2013
    Configuration menu
    Copy the full SHA
    d04f685 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2013

  1. New closure class 

    Added:
	M closure class
	TruthTable class
Renamed:
	KNFConverter -> SKNFConverter
	DNFConverter -> SDNFConverter
    Max committed Dec 12, 2013
    Configuration menu
    Copy the full SHA
    082ce46 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5 from aivel/sem 

    Sem
    @SammyVimes
    SammyVimes committed Dec 12, 2013
    Configuration menu
    Copy the full SHA
    17ffb2e View commit details
    Browse the repository at this point in the history

  3. Merged changes from MAX

    @SammyVimes
    SammyVimes committed Dec 12, 2013
    Configuration menu
    Copy the full SHA
    d190c52 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2013

  1. Merge pull request #7 from SammyVimes/sem 

    merging last changes to edik
    @SammyVimes
    SammyVimes committed Dec 13, 2013
    Configuration menu
    Copy the full SHA
    15860bd View commit details
    Browse the repository at this point in the history

  2. Update ClosureClasses.java

    aivel committed Dec 13, 2013
    Configuration menu
    Copy the full SHA
    6564800 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from aivel/patch-1 

    Update ClosureClasses.java
    @SammyVimes
    SammyVimes committed Dec 13, 2013
    Configuration menu
    Copy the full SHA
    fd7f078 View commit details
    Browse the repository at this point in the history

  4. Fixed closure classes

    @SammyVimes
    SammyVimes committed Dec 13, 2013
    Configuration menu
    Copy the full SHA
    d0341ed View commit details
    Browse the repository at this point in the history

  5. Merge branch 'edik' of https://github.com/SammyVimes/bool4j into edik

    @SammyVimes
    SammyVimes committed Dec 13, 2013
    Configuration menu
    Copy the full SHA
    1714f21 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2013

  1. Fixed memory leak 

    Fixed memory leak with truth table usage in M closure class
    @SammyVimes
    SammyVimes committed Dec 15, 2013
    Configuration menu
    Copy the full SHA
    aaeeca8 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2013

  1. Убрал truthtable из closure class

    @SammyVimes
    SammyVimes committed Dec 16, 2013
    Configuration menu
    Copy the full SHA
    add43ec View commit details
    Browse the repository at this point in the history

  2. Реализован парсинг аргументов функции

    @SammyVimes
    SammyVimes committed Dec 16, 2013
    Configuration menu
    Copy the full SHA
    286b0c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2013

  1. Massive commit 

    Fixed packages (all move to ru.matlog.*), added validation and
exceptions
    @SammyVimes
    SammyVimes committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    d47918d View commit details
    Browse the repository at this point in the history

  2. fixed packagename

    @SammyVimes
    SammyVimes committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    d288d26 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #14 from SammyVimes/sem 

    Sem
    @SammyVimes
    SammyVimes committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    19140cd View commit details
    Browse the repository at this point in the history

  4. fixed function args parsing

    @SammyVimes
    SammyVimes committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    509af4c View commit details
    Browse the repository at this point in the history

  5. Fixed empty variable name

    @SammyVimes
    SammyVimes committed Dec 19, 2013
    Configuration menu
    Copy the full SHA
    ac3e7eb View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2013

  1. Merge branch 'max' of https://github.com/SammyVimes/bool4j into max

    @SammyVimes
    SammyVimes committed Dec 20, 2013
    Configuration menu
    Copy the full SHA
    3a5c1af View commit details
    Browse the repository at this point in the history