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

Jump to bottom

Release 0.3.3.14-8-2013 #12

Merged
merged 85 commits into from Aug 15, 2013
Merged

Release 0.3.3.14-8-2013 #12

merged 85 commits into from Aug 15, 2013

Commits on Apr 20, 2013

  1. JSON output i200 added --json argument 

    http://gsd.uwaterloo.ca:8888/question/873/produce-instance-data-as-json
refactored IG Env to reduce duplication and nest IGArgs and ClaferEnv
bumped version to 0.3.3
added dependency on json-builder and string-conversions
split --addUidsAndTypes into --useUids and --addTypes. --json forces
--addUids
    @mantkiew
    mantkiew committed Apr 20, 2013
    Copy the full SHA
    6737b22 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2013

  1. overlapping is true for references and false for colons

    @mantkiew
    mantkiew committed Apr 22, 2013
    Copy the full SHA
    8808498 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2013

  1. Merge branch 'master' into develop

    @mantkiew
    mantkiew committed Apr 29, 2013
    Copy the full SHA
    c99765c View commit details
    Browse the repository at this point in the history

Commits on May 3, 2013

  1. [224] Fixed Bug Where scope was allowed over bitwidth's capacity 

    http://gsd.uwaterloo.ca:8888/question/936/disallow-scopes-larger-than-allowed-by-bitwidth
    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 3, 2013
    Copy the full SHA
    383b7e5 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2013

  1. Merge branch 'master' into develop

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 6, 2013
    Copy the full SHA
    c14d03d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into scope

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 6, 2013
    Copy the full SHA
    8e23f27 View commit details
    Browse the repository at this point in the history

  3. [224] Fixed Bug Where scope was allowed over bitwidth's capacity

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 6, 2013
    Copy the full SHA
    fbebbaa View commit details
    Browse the repository at this point in the history

  4. [224] Fixed Bug Where scope was allowed over Bitwidth's capacity

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 6, 2013
    Copy the full SHA
    067cdff View commit details
    Browse the repository at this point in the history

Commits on May 9, 2013

  1. Fixed error message not displaying when non global scope was increase… 

    …d over bitwidth max capcity with "i #"
    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 9, 2013
    Copy the full SHA
    3b81978 View commit details
    Browse the repository at this point in the history

  2. fixed small bug where extra empty newlines where made when calling i #

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 9, 2013
    Copy the full SHA
    4521bdb View commit details
    Browse the repository at this point in the history

  3. Added clarification on which scope was exceeding the bitwidth's capacity

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 9, 2013
    Copy the full SHA
    bf8c575 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2013

  1. Merge pull request #3 from gsdlab/scope 

     disallow scopes larger than allowed by bitwidth

Everything looks okay. FYI:

```haskell
if x then outputStrLn y else return ()
```

can be rewriten as

```haskell
when x $ outputStrLn y
```
    @JLiangWaterloo
    JLiangWaterloo committed May 12, 2013
    Copy the full SHA
    75eb27f View commit details
    Browse the repository at this point in the history

Commits on May 28, 2013

  1. When showing instance of clafers of type "string" it will now display… 

    … the proper string rather than just the integer
    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 28, 2013
    Copy the full SHA
    b15d1ad View commit details
    Browse the repository at this point in the history

  2. Cleaned up Sugarer.hs

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 28, 2013
    Copy the full SHA
    05d9fe0 View commit details
    Browse the repository at this point in the history

  3. fixed bug where naming another type as a string would still display i… 

    …t as an integer
    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 28, 2013
    Copy the full SHA
    2112db2 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2013

  1. Fixed bug where error occured on nested clafers with string values an… 

    …d failed when using real value
    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 29, 2013
    Copy the full SHA
    b6cbaa0 View commit details
    Browse the repository at this point in the history

  2. Changed StringValue and intValue sharing the same Value Constructor

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 29, 2013
    Copy the full SHA
    88d956a View commit details
    Browse the repository at this point in the history

Commits on May 30, 2013

  1. Fixed bugged with not making random strings and re organized for read… 

    …ability
    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 30, 2013
    Copy the full SHA
    6dd0614 View commit details
    Browse the repository at this point in the history

  2. more re organization for readability

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 30, 2013
    Copy the full SHA
    b0866b5 View commit details
    Browse the repository at this point in the history

  3. Added " " to the string returned when making random strings

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 30, 2013
    Copy the full SHA
    ffb7ac6 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2013

  1. Added test infrastructure

    @Luke-Michael-Brown
    Luke-Michael-Brown committed May 31, 2013
    Copy the full SHA
    b32fcaf View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2013

  1. Merge branch 'develop' into strMap

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    c04f9c2 View commit details
    Browse the repository at this point in the history

  2. added test infrastructure

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    babc2df View commit details
    Browse the repository at this point in the history

  3. refactored code into Language.Clafer.IG library

    @mantkiew
    mantkiew committed Jun 3, 2013
    Copy the full SHA
    070c5db View commit details
    Browse the repository at this point in the history

  4. Added copyright to test-suite

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    132961f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into strMap

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    fe3e654 View commit details
    Browse the repository at this point in the history

  6. Fixed small bugs

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    9b9892d View commit details
    Browse the repository at this point in the history

  7. Fixed small bug

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 3, 2013
    Copy the full SHA
    d25320d View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2013

  1. Merge pull request #4 from gsdlab/strMap 

    [220] display string values
    @JLiangWaterloo
    JLiangWaterloo committed Jun 4, 2013
    Copy the full SHA
    fac6e71 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2013

  1. Started work towards adding test case

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 13, 2013
    Copy the full SHA
    8642442 View commit details
    Browse the repository at this point in the history

  2. Fixed problem on makeFile where minisat would not install on mingw-6.1

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 13, 2013
    Copy the full SHA
    78d8075 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2013

  1. Fixed i236

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 14, 2013
    Copy the full SHA
    ebcb389 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2013

  1. fixed i63 

    http://gsd.uwaterloo.ca:8888/question/257/preserve-the-scopes-during-reload
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 18, 2013
    Copy the full SHA
    f0f60ae View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2013

  1. Fixed i31 

    http://gsd.uwaterloo.ca:8888/question/152/determine-the-right-bitwidth
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 19, 2013
    Copy the full SHA
    ea69031 View commit details
    Browse the repository at this point in the history

  2. Fixed typos

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 19, 2013
    Copy the full SHA
    f388556 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2013

  1. Fixed errors from previous commit 

    - Did not take into account editing file while running IG
- Removed assumption that all scopes default one rather than just global
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 24, 2013
    Copy the full SHA
    ee6b6e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2013

  1. Fixed bug where bitwidth was not updated upon reload

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 25, 2013
    Copy the full SHA
    84a6c36 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from gsdlab/i63 

    fixed i63
    @JLiangWaterloo
    JLiangWaterloo committed Jun 25, 2013
    Copy the full SHA
    43f6226 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5 from gsdlab/i236 

    Fixed i236
    @JLiangWaterloo
    JLiangWaterloo committed Jun 25, 2013
    Copy the full SHA
    0e80d5b View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2013

  1. Fixed bugs caused by merge i236

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 26, 2013
    Copy the full SHA
    75763b3 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2013

  1. Fixed merged conflicts

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 27, 2013
    Copy the full SHA
    19c2458 View commit details
    Browse the repository at this point in the history

  2. Fixed i59 

    http://gsd.uwaterloo.ca:8888/question/250/add-line-numbers-scopes-and-unsat-core-markers-to
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 27, 2013
    Copy the full SHA
    14447d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2013

  1. Fixed UnSAT not showing up for unSAT errors refering to constraints

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 28, 2013
    Copy the full SHA
    d1ca3b5 View commit details
    Browse the repository at this point in the history

  2. Fixed small bug with constraints containing | and cleaned up design

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jun 28, 2013
    Copy the full SHA
    be97c21 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from gsdlab/i31 

    Implemented [I31] http://gsd.uwaterloo.ca:8888/question/152/determine-the-right-bitwidth
    @mantkiew
    mantkiew committed Jun 28, 2013
    Copy the full SHA
    09e9c67 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2013

  1. Merged develop.

    @JLiangWaterloo
    JLiangWaterloo committed Jun 29, 2013
    Copy the full SHA
    670265e View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2013

  1. fixed bug from i31

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 2, 2013
    Copy the full SHA
    01b2be5 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2013

  1. Cleaned up implementation 

    Also fixed bug where unexpected result appeared when having a model with
unSAT errors that contained comments.
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 3, 2013
    Copy the full SHA
    983aa1e View commit details
    Browse the repository at this point in the history

  2. fixed: IG could not sugar models with 'int' instead of 'integer'

    @mantkiew
    mantkiew committed Jul 3, 2013
    Copy the full SHA
    f16f5aa View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/gsdlab/claferIG into dev… 

    …elop
    @mantkiew
    mantkiew committed Jul 3, 2013
    Copy the full SHA
    9ffea4b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into i59

    @mantkiew
    mantkiew committed Jul 3, 2013
    Copy the full SHA
    e2fc2a3 View commit details
    Browse the repository at this point in the history

  5. new version

    @mantkiew
    mantkiew committed Jul 3, 2013
    Copy the full SHA
    5f8bc66 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2013

  1. Cleaned up unSAT implementation

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 5, 2013
    Copy the full SHA
    5563ded View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2013

  1. Fixed a bug relating to i31

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    707a836 View commit details
    Browse the repository at this point in the history

  2. Fixed issues relating to the previous commit

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 8, 2013
    Copy the full SHA
    8897fbc View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2013

  1. Fixed bug resulting from fixing i74 

    http://gsd.uwaterloo.ca:8888/question/338/problem-with-translation-of-abstract-clafers-in
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 9, 2013
    Copy the full SHA
    459a19f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2013

  1. Changed implementation of findNeccecaryBitwidth so that takes advanta… 

    …ge of the IR
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 10, 2013
    Copy the full SHA
    4aef5a5 View commit details
    Browse the repository at this point in the history

  2. Fixed bug where getId function looked up wrong Id

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 10, 2013
    Copy the full SHA
    b73f7b0 View commit details
    Browse the repository at this point in the history

  3. updated package versions, new version, cabal >= 1.16, test cases for i74

    @mantkiew
    mantkiew committed Jul 10, 2013
    Copy the full SHA
    88e4d1f View commit details
    Browse the repository at this point in the history

  4. Changed how IG responds to scope increases beyond bitwidth capcity 

    IG now simply reports the too large scope and increase the bitwidth to
allow it
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 10, 2013
    Copy the full SHA
    30e87d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2013

  1. Fixed a bug where for certain models calling AlloyModel cause a fromJ… 

    …ust error
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 11, 2013
    Copy the full SHA
    0b604e7 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2013

  1. Added emptyFile check to give a better error message

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 12, 2013
    Copy the full SHA
    da478b0 View commit details
    Browse the repository at this point in the history

  2. Edited error message from previous commit

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 12, 2013
    Copy the full SHA
    0184c6c View commit details
    Browse the repository at this point in the history

  3. Edited the IG test infrastructure to match that of Clafer's

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 12, 2013
    Copy the full SHA
    01f45c1 View commit details
    Browse the repository at this point in the history

  4. Fixed a bug where sometimes UnSAT was not shown when calling claferMo… 

    …del in certain cases

Also Moved backquoted as it has yet to be fixed
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 12, 2013
    Copy the full SHA
    65fe623 View commit details
    Browse the repository at this point in the history

  5. Change the implementation of the previous bug fix 

    Slightly less error prone than the last fix
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 12, 2013
    Copy the full SHA
    6978bc8 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2013

  1. Rearranged test files

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 16, 2013
    Copy the full SHA
    8d4632b View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2013

  1. Merge pull request #10 from gsdlab/i59 

    Cleaned up implementation
    @JLiangWaterloo
    JLiangWaterloo committed Jul 17, 2013
    Copy the full SHA
    0eb22cc View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2013

  1. Fixed Warnings for IG

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 19, 2013
    Copy the full SHA
    827574d View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2013

  1. Fixed the last warning fixes in Sugarer and ClaferModel

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 22, 2013
    Copy the full SHA
    3dbb81b View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2013

  1. Added -O option to GHC when make install

    @mantkiew
    mantkiew committed Jul 30, 2013
    Copy the full SHA
    3b77ba5 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2013

  1. Added skip_goals to always be true in IG

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    ef51382 View commit details
    Browse the repository at this point in the history

  2. Changed how Version.hs is generated to include top level definition

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    19e6aef View commit details
    Browse the repository at this point in the history

  3. Merge branch 'WarningFixes' into i253

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    a7ab0bb View commit details
    Browse the repository at this point in the history

  4. Added make new command

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    260708c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'WarningFixes' into i253

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    1a2da02 View commit details
    Browse the repository at this point in the history

  6. Simplified makeSimpleName function

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    3155138 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'WarningFixes' into i253

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Jul 31, 2013
    Copy the full SHA
    55a03b1 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2013

  1. Changed name of new Make command

    @Luke-Michael-Brown
    Luke-Michael-Brown committed Aug 1, 2013
    Copy the full SHA
    381bd81 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2013

  1. Fixed a bug where findNecessaryBitwidth did not account for cardinali… 

    …ties
    @Luke-Michael-Brown
    Luke-Michael-Brown committed Aug 2, 2013
    Copy the full SHA
    462e3bc View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2013

  1. Merge pull request #11 from gsdlab/WarningFixes 

    Fixed Warnings for IG
    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    31d278f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/i253' into develop

    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    31ffc77 View commit details
    Browse the repository at this point in the history

  3. new version

    @mantkiew
    mantkiew committed Aug 10, 2013
    Copy the full SHA
    e4cc9c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2013

  1. updated versions of dependencies and the readme

    @mantkiew
    mantkiew committed Aug 11, 2013
    Copy the full SHA
    b3600f7 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2013

  1. release ClaferIG v0.3.3.14-8-2013

    @mantkiew
    mantkiew committed Aug 13, 2013
    Copy the full SHA
    fd4176e View commit details
    Browse the repository at this point in the history