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

Use Open WBO totalizer encoding for At Most One constraints #26

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

Use Open WBO totalizer encoding for At Most One constraints #26

wants to merge 34 commits into from

Commits on Sep 13, 2018

  1. Use Open-WBOs Totalizer encoding for at most 1 constraint 

    Signed-off-by: Sukrut Rao <[email protected]>
    @sukrutrao
    sukrutrao committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    a5855f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' of github.com:GoodDeeds/Timetabler into de… 

    …velopment
    @sukrutrao
    sukrutrao committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    c004b2f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' of github.com:GoodDeeds/Timetabler into de… 

    …velopment
    @prateekkumarweb
    prateekkumarweb committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    a86e126 View commit details
    Browse the repository at this point in the history

  4. Fix compiler error 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    e5c7f57 View commit details
    Browse the repository at this point in the history

  5. Use customized totalizer encoding based off OpenWBO 

    Signed-off-by: Sukrut Rao <[email protected]>
    @sukrutrao
    sukrutrao committed Sep 13, 2018
    Configuration menu
    Copy the full SHA
    f25a078 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. Merge branch 'master' into totalizer 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    1da2314 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. Merge branch 'master' into totalizer 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    dea0f8b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into totalizer 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    d2249c9 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. Fix bug, minor improvements 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 9, 2018
    Configuration menu
    Copy the full SHA
    b641830 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2018

  1. Merge branch 'master' into bugfix 

    Signed-off-by: Sukrut Rao <[email protected]>
    @sukrutrao
    sukrutrao committed Nov 10, 2018
    Configuration menu
    Copy the full SHA
    0b0cbf7 View commit details
    Browse the repository at this point in the history

  2. Use logger to indicate completed parsing

    @sukrutrao
    sukrutrao committed Nov 10, 2018
    Configuration menu
    Copy the full SHA
    0a1b7b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2018

  1. Reset variables in custom_parser: constraint_expr 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    03dc6cc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfix' of github.com:GoodDeeds/Timetabler into bugfix

    @prateekkumarweb
    prateekkumarweb committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    0a29355 View commit details
    Browse the repository at this point in the history

  3. yaml-cpp: Do not build unnecessary tools 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    c863bb7 View commit details
    Browse the repository at this point in the history

  4. snap: Fix issue with accessing home folder 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    402552b View commit details
    Browse the repository at this point in the history

  5. snap: Fix deprecated warning 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 11, 2018
    Configuration menu
    Copy the full SHA
    c9c1f13 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2018

  1. constraint_adder: unbundle some of the predefined constraints 

    minorInMinorTime
programAtMostOneOfCoreOrElective
exactlyOneFieldValuePerCourse

Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 13, 2018
    Configuration menu
    Copy the full SHA
    d7cd72a View commit details
    Browse the repository at this point in the history

  2. Wrap custom parser grammar in namespace 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 13, 2018
    Configuration menu
    Copy the full SHA
    f2d3859 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2018

  1. doxygen: generate docs for custom constraint grammar 

    Now the class list will not be cluttered in doxygen as all
the relevant classes for custom constraint grammar are
put in a namespace

Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    e226f3f View commit details
    Browse the repository at this point in the history

  2. doxygen: Add documentation of some of the undocumented functions 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    fdc5d46 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2018

  1. Predefined Constraint: Add high level vars for each course 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 17, 2018
    Configuration menu
    Copy the full SHA
    5737962 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2018

  1. cmake: Add -Wpedantic flag 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    c8b1d77 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2018

  1. Change MinorType to enum class (also fixes isMinor bug) 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    2885211 View commit details
    Browse the repository at this point in the history

  2. Parser: CSV Parser program Core/Elective/No 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Nov 29, 2018
    Configuration menu
    Copy the full SHA
    2fec7b7 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2018

  1. Generate version number from git 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    86478f6 View commit details
    Browse the repository at this point in the history

  2. Run gen_version.sh inside cmake 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    9c552fe View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bugfix' into totalizer 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    70cd9b2 View commit details
    Browse the repository at this point in the history

  4. Fix compiling issue in src/totalizer.cpp 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    95d4066 View commit details
    Browse the repository at this point in the history

  5. gen_version.sh: Disable print of version 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    6440035 View commit details
    Browse the repository at this point in the history

  6. snap: Fix version number in snap 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 12, 2018
    Configuration menu
    Copy the full SHA
    045526a View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2018

  1. install_dependencies.sh: Update folder names to not contain version 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    8321fde View commit details
    Browse the repository at this point in the history

  2. snap: Speed up dependency installation, fix version 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    0843e50 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'bugfix' into totalizer 

    Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    0cf3353 View commit details
    Browse the repository at this point in the history

  4. Fix hasEncoding in Totalizer build 

    (When RHS is equal to lits.size())

Signed-off-by: Prateek Kumar <[email protected]>
    @prateekkumarweb
    prateekkumarweb committed Dec 13, 2018
    Configuration menu
    Copy the full SHA
    b9ccec8 View commit details
    Browse the repository at this point in the history