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

Translation from Conjure-Oxide Model to CNF KissSAT #83

Merged
merged 17 commits into from
Jan 29, 2024
Merged

Translation from Conjure-Oxide Model to CNF KissSAT #83

merged 17 commits into from
Jan 29, 2024

Commits on Nov 18, 2023

  1. Initial implementation for the CNF format

    @gskorokhod
    gskorokhod committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    e0a5112 View commit details
    Browse the repository at this point in the history

  2. tests

    @gskorokhod
    gskorokhod committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    effa54b View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge branch 'main' of https://github.com/conjure-cp/conjure-oxide in… 

    …to conjure-cp-main
    @gskorokhod
    gskorokhod committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    45c4fb4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'conjure-cp-main' into issue-73

    @gskorokhod
    gskorokhod committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    ae37d66 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Implement ordering variables in the CNF struct

    @gskorokhod
    gskorokhod committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    cb858d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. remove .idea

    @gskorokhod
    gskorokhod committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    d724276 View commit details
    Browse the repository at this point in the history

  2. remove .idea

    @gskorokhod
    gskorokhod committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    a48d982 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. Merge pull request #8 from conjure-cp/main 

    merge main
    @gskorokhod
    gskorokhod authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    cc11bed View commit details
    Browse the repository at this point in the history

  2. remove idea folder in python tool

    @gskorokhod
    gskorokhod committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    e62869d View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge remote-tracking branch 'upstream/main' into issue-73

    @niklasdewally
    niklasdewally committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    a9846b1 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. WIP

    @gskorokhod
    gskorokhod committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    962b00e View commit details
    Browse the repository at this point in the history

  2. Lint with Clippy

    @gskorokhod
    gskorokhod committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    4c5d575 View commit details
    Browse the repository at this point in the history

  3. Resolve merge conflict

    @gskorokhod
    gskorokhod committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    71e26b9 View commit details
    Browse the repository at this point in the history

  4. Lint with Clippy

    @gskorokhod
    gskorokhod committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    dd0e2d6 View commit details
    Browse the repository at this point in the history

  5. Fix formatting

    @gskorokhod
    gskorokhod committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    c643cf6 View commit details
    Browse the repository at this point in the history

  6. Remove IDEA files

    @gskorokhod
    gskorokhod committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    daa4f0f View commit details
    Browse the repository at this point in the history

  7. Throw NotSupported instead of InvalidInstance

    @gskorokhod
    gskorokhod committed Jan 26, 2024
    Configuration menu
    Copy the full SHA
    ac6a5df View commit details
    Browse the repository at this point in the history