Neil Brown
acd57d74de
Changed the A.Structured type to be parameterised
...
This patch is actually an amalgam of multiple (already large) patches. Those patches conflicted (parameterised Structured vs. changes to usage checking and FlowGraph) and encountered a nasty bug in darcs 1 involving exponential time (see http://wiki.darcs.net/DarcsWiki/ConflictsFAQ for more details). Reasoning that half an hour (of 100% CPU use) was too long to apply patches, I opted to re-record the parameterised Structured changes as this new large patch. Here are the commit messages originally used for the patches (which, as mentioned, were already large patches):
A gigantic patch switching all the non-test modules over to using parameterised A.Structured
Changed the FlowGraph module again to handle any sort of Structured you want to pass to it (mainly for testing)
A further gigantic patch changing all the tests to work with the new parameterised Structured
Fixed a nasty bug involving functions being named incorrectly inside transformInputCase
Added a hand-written instance of Data for Structured that allows us to use ext1M properly
Fixed a few warnings in the code
2008-02-05 19:40:27 +00:00
Neil Brown
edc3a7e910
Removed the die function (that has no source position) and as far as possible replaced all its uses with dieP and a valid position
2008-01-28 17:21:13 +00:00
Neil Brown
efc69a97cf
Moved all the modules related to usage-checking into a new checks directory
2008-01-28 12:25:00 +00:00
Neil Brown
9cd2da3b0e
A large change to alter RainUsageCheck to use the code in UsageCheck
...
Previously there was near-duplicate code in UsageCheck adapted from RainUsageCheck. This patch removed the duplicate code on the RainUsageCheck side, and resulting in changing the rest of the module (and its corresponding test module) to use the new UsageCheck version of the code. The net effect is to almost completely unify the passes in RainUsageCheck (which aren't really Rain-specific anyway), UsageCheck and ArrayUsageCheck.
2008-01-27 23:53:42 +00:00
Neil Brown
060c26da84
Added to the export list of UsageCheck
2008-01-27 23:52:06 +00:00
Neil Brown
ad7b4e9736
Began trying to fix the customVarCompare function in UsageCheck
2008-01-27 23:51:49 +00:00
Neil Brown
668ed9531e
Fiddled with the Show/showCode capabilities of the newtype Var in UsageCheck
2008-01-27 23:51:16 +00:00
Neil Brown
1cc731a7d8
Changed a little code to use the more appropriate fromMaybe function rather than maybe
2008-01-27 18:37:02 +00:00
Neil Brown
349d3c5811
Merged makeEquations with makeReplicatedEquations and adjusted the tests accordingly
2008-01-27 16:53:07 +00:00
Neil Brown
7276c3cc4a
Added proper support for sequential items in non-replicated PARs in the array usage checking
2008-01-27 01:43:42 +00:00
Neil Brown
d37253d2af
Improved the error message given by ArrayUsageCheck
2008-01-26 22:57:01 +00:00
Neil Brown
127cdea242
Overhauled the ArrayUsageCheck system to label the resulting problems with the expressions of the two array indexes involved in each problem, and changed the tests accordingly
2008-01-26 22:16:42 +00:00
Neil Brown
7e7395d47f
Added test names to some of the tests in ArrayUsageCheckTest
2008-01-26 21:55:02 +00:00
Neil Brown
bdda623d7e
Added types to all the cases where the monomorhpism restriction applied
2008-01-26 20:51:11 +00:00
Neil Brown
741a01de5a
Removed various tab characters and replaced them with spaces
2008-01-26 19:38:24 +00:00
Neil Brown
ff37613498
Fixed the code so that each PAR groups properly (by edge identifier) but the tests still fail
2008-01-25 18:12:32 +00:00
Neil Brown
8a39eb597c
Removed an old comment in ArrayUsageCheck
2008-01-25 17:54:35 +00:00
Neil Brown
90bc9b7033
Implemented checkPar using a graph search, and removed the need for giving it a start node
2008-01-25 17:36:16 +00:00
Neil Brown
f46cabdb22
Cannibalised code from the RainUsageCheck module to implement the labelling functions in the UsageCheck module
2008-01-25 16:34:54 +00:00
Neil Brown
64a9292b75
Moved customVarCompare from ArrayUsageCheck to UsageCheck and used it to derive Ord for the Var type
2008-01-25 16:34:18 +00:00
Neil Brown
c2c761ab7d
Added an export list to the UsageCheck module
2008-01-25 16:33:57 +00:00
Neil Brown
178af1ca24
Changed the array usage checking to distinguish between read-from and written-to indexes, while also beginning to overhaul the system to make a more general usage-checking framework that operates on the control flow graph
2008-01-25 16:17:17 +00:00
Neil Brown
10493717aa
Added tests with multi-dimensional arrays
2008-01-25 16:16:16 +00:00
Neil Brown
330405f983
Added more usage-checking tests
2008-01-25 11:50:57 +00:00
Neil Brown
0d6e06607b
Added a couple more tests
2008-01-25 11:19:58 +00:00
Neil Brown
6f4146a4f3
Altered the name of the exported ArrayUsageCheckTest function to match the new convention
2008-01-23 13:59:38 +00:00
Neil Brown
dc0d9b16d4
Altered the array usage checker to deal with replication properly, and pass the makeEquations test
2008-01-22 22:16:16 +00:00
Neil Brown
0dd6a852bd
Altered the other two tests according to the new way replicated variables are handled
2008-01-22 22:08:01 +00:00
Neil Brown
b6912651db
Added sorting of problems to make comparing two problem lists straightforward (for testing the array usage checker)
2008-01-22 21:47:21 +00:00
Neil Brown
fca070e1bc
Changed the way replicated variables are handled and altered one of the tests accordingly
2008-01-20 17:02:05 +00:00
Neil Brown
01783071a8
Added a large chunk of documentation about replicated variables and cleaned up the squareAndPair function to remove an unused portion of the arguments
2008-01-20 15:31:23 +00:00
Neil Brown
bc820e87ce
Fixed the bounds for replicated variables; two of the three tests now pass
2008-01-20 15:01:45 +00:00
Neil Brown
c0105b1491
Put a scheme in place for adding replicated variable bounds, but it is incorrect
2008-01-20 14:34:56 +00:00
Neil Brown
0e35f5cd38
Changed ArrayUsageCheck to only insert the one inequality between the two versions of a replicated variable, but now missing the replication-bounds on both
2008-01-19 15:40:57 +00:00
Neil Brown
fb0d2fe6a2
Changed test 200 in ArrayUsageCheckTest to match the new arrangement I have in mind
2008-01-19 15:38:13 +00:00
Neil Brown
ed8033833b
Added the code and tests for forming problems involving replication, but currently one of the two (or both) is buggy
2008-01-16 19:31:56 +00:00
Neil Brown
663cbaeaa1
Added support to the squareAndPair function for adding in extra inequalities
2008-01-16 19:23:58 +00:00
Neil Brown
ee102c10a3
Moved makeSize to the top-level of ArrayUsageCheck
2008-01-16 18:41:02 +00:00
Neil Brown
312719088a
Added a helper function to ArrayUsageCheck
2008-01-16 18:40:21 +00:00
Neil Brown
fde2d8dc17
Changed the assertEquivalentProblems so that the sizes are displayed alongside the zipped lists
2008-01-16 16:25:57 +00:00
Neil Brown
2edeb1bb7b
Added a new helper function in ArrayUsageCheck
2008-01-16 15:34:42 +00:00
Neil Brown
ec804649e8
Moved lots of functions to the top-level in ArrayUsageCheck
2008-01-16 15:34:03 +00:00
Neil Brown
6e28d3e3db
Moved the flatten function to the top level of the ArrayUsageCheck module
2008-01-16 15:09:26 +00:00
Neil Brown
5f2158531b
Added an export list to the ArrayUsageCheck module
2008-01-16 12:57:05 +00:00
Neil Brown
143c3b1994
Split out the ArrayUsageCheck module into ArrayUsageCheck (for formulating problems from code) and Omega (just the Omega Test)
2008-01-16 12:53:17 +00:00
Neil Brown
6d45352819
Added support for distinct versions of the same variable, ready to support replication
2008-01-16 12:43:39 +00:00
Neil Brown
af130291fc
Added some tests for replicated indexes in parallel
2008-01-16 12:14:09 +00:00
Neil Brown
bc2ffc59be
Corrected the bounds checking so that (size - 1) is used as the maximum index (not size, as before)
2008-01-16 11:52:32 +00:00
Neil Brown
0df68e53e5
Moved addConstant to the top level of ArrayUsageCheck
2008-01-16 11:52:11 +00:00
Neil Brown
0e57c7af55
Removed a piece of dead code from ArrayUsageCheck
2008-01-16 11:51:54 +00:00
Neil Brown
4b0d29d987
Added support for actually bounds-checking the array based on its declared size
2008-01-16 11:47:54 +00:00
Neil Brown
183e68ee59
Corrected the display of variables relating to REM
2008-01-16 11:34:56 +00:00
Neil Brown
a14a866502
Changed the test harness to get some tests inside the IO monad. This allows all the tests to be run, not just until the first failure
2008-01-16 11:15:05 +00:00
Neil Brown
90fb5e2182
Fixed a bug where multiple problems would be deemed safe as long as one didn't have a solution (as opposed to all not having solutions)
2008-01-16 10:52:51 +00:00
Neil Brown
b5606eb7a9
Tidied up the error messages given when the array usage checker finds a problem
2008-01-16 03:37:53 +00:00
Neil Brown
1c0434cc47
Corrected a small omission in the cases for testing array indices (if there are no problems to work with)
2008-01-16 03:29:13 +00:00
Neil Brown
b3216c4870
Added a test-source-file for testing the array usage checker, and added it to the appropriate test list
2008-01-16 03:28:26 +00:00
Neil Brown
64a9fcf2dd
Added the functionality for variable divisors with REM
2008-01-16 01:49:02 +00:00
Neil Brown
bd998a5b95
Added a test for REM with a variable divisor
2008-01-16 01:48:39 +00:00
Neil Brown
612893bd0c
Corrected a bug from using zip where an "actual" list of size N would only match the first N elements of the expected, even if expected had more than N items
2008-01-16 00:39:05 +00:00
Neil Brown
f7503ac58c
Added a further test involving two REM operations (both still with constant divisors)
2008-01-15 21:22:46 +00:00
Neil Brown
43d0098f99
Added another test for formulating a problem involving the REM operator
2008-01-15 19:14:34 +00:00
Neil Brown
a00b1ea602
Fixed the existing test for modulo items (it now also passes)
2008-01-15 18:50:22 +00:00
Neil Brown
3e674e3773
Fixed the pairing of indices so that two parts of a modulo triplicate-possibility are never paired with each other, and removed the filtering of all-zero equations (primarily to aid in the testing)
2008-01-15 18:48:00 +00:00
Neil Brown
bc7c5072b8
Fixed the display of equations such as 0 = 0 after test failure
2008-01-15 18:47:28 +00:00
Neil Brown
2cb0610d83
Added custom, much more readable display of problems when the assertEquivalentProblems function fails
2008-01-15 18:12:04 +00:00
Neil Brown
d3fca1d610
Moved showMaybe to the Utils module and added a similar showListCustom function
2008-01-15 18:08:56 +00:00
Neil Brown
05e2678cf6
Corrected a bug in the comparison function for FlattenedExp
2008-01-15 17:44:35 +00:00
Neil Brown
f6ba7be173
Changed various uses of the maximum function to make sure they always succeed
2008-01-15 17:33:19 +00:00
Neil Brown
918b9e7af7
Changed the array usage checking and all the tests to support modulo and division
...
This patch is unavoidably large (no easy way to split it down). The code compiles, but the modulo test (which is currently wrong anyway) fails at the moment
2008-01-15 17:08:15 +00:00
Neil Brown
421cff1017
Removed the useless (and wrong) scaling aspect of makeEquations
2008-01-12 11:59:55 +00:00
Neil Brown
97fc225bf3
Added some more comments to the Omega Test code
2008-01-09 17:24:56 +00:00
Neil Brown
26bd792e61
Fixed a bug where the non-pruned version of the inequalities were being used in fmElimination; the Omega Test now functions properly
2008-01-09 17:14:15 +00:00
Neil Brown
524275cd9f
Added the ability to print out the variable mapping and inequalities in a more readable format when tests fail
2008-01-09 17:14:02 +00:00
Neil Brown
d5a9829b0f
Fixed the brute-force problems function so that it properly uses all inequalities not just the left-overs
2008-01-09 14:56:26 +00:00
Neil Brown
4ef97ed8b4
Changed the solveAndPrune test function to always have a valid mapping, even if there are no equalities
2008-01-09 14:55:59 +00:00
Neil Brown
4ee25b62ca
Added some more comments to the fmElimination function
2008-01-09 12:46:50 +00:00
Neil Brown
8ec4832a03
Removed the unused half of VariableMapping
2008-01-09 12:27:02 +00:00
Neil Brown
57f18e5b18
Finished implementing the Omega Test - but a few tests are failing and I cannot yet see why
2008-01-09 12:05:09 +00:00
Neil Brown
d23baf719b
Added support for multiplication to the usage checking
2007-12-17 11:56:51 +00:00
Neil Brown
337d339641
Added comments to the makeEquations function
2007-12-17 11:43:18 +00:00
Neil Brown
218a1bd22c
Rearranged the tests for makeEquations to use a helper function, and added a couple of cases (one of which doesn't yet pass)
2007-12-17 02:38:05 +00:00
Neil Brown
8f1d1368af
Stopped makeEquations unnecessarily producing duplicate equations
2007-12-17 02:22:09 +00:00
Neil Brown
5a721fb428
Fixed the processing of expressions to equations to properly square the equations
2007-12-17 02:13:40 +00:00
Neil Brown
dc76d00085
Added better helper functions for testing the processing of expressions into equations
2007-12-17 02:13:17 +00:00
Neil Brown
1733869afd
Tidied up the tests and amended SolveEq to allow you to provide the answers, which are then checked
2007-12-16 19:20:53 +00:00
Neil Brown
02aa63ffda
Fixed the QuickCheck equality-equation generater so that it can no longer produce unsolveable equations
2007-12-16 19:05:32 +00:00
Neil Brown
70ce98021a
Added a few more HUnit tests for the equality solver
2007-12-16 19:05:01 +00:00
Neil Brown
3965babaff
Tidied up the testing framework for the HUnit Omega Test tests
2007-12-16 15:27:07 +00:00
Neil Brown
7403588aea
Fixed a situation where QuickCheck could occasionally generate duplicate equalities (where one was the negation of the other)
2007-12-16 14:12:29 +00:00
Neil Brown
423d22fa13
Moved the ArrayUsageCheck tests to their own new file (ArrayUsageCheckTest)
2007-12-16 14:02:45 +00:00
Neil Brown
4f88a1e4a1
Added negative coefficients to the QuickCheck tests
2007-12-16 13:43:45 +00:00
Neil Brown
a0203ff971
Corrected a haddock comment
2007-12-16 13:38:23 +00:00
Neil Brown
6320bfdffb
Tidied up some of the QuickCheck tests for the Omega Test pruning
2007-12-16 13:35:51 +00:00
Neil Brown
cc7d32ffeb
Corrected a mistake in a comment
2007-12-16 12:51:41 +00:00
Neil Brown
3a65651885
Added a really hacky initial implementation of a pass that checks that parallel array usage is safe
2007-12-16 02:07:02 +00:00
Neil Brown
b4ccc9f8de
Changed the representation of the exact (constant) solutions to equations to be a simple Map
2007-12-16 00:55:38 +00:00
Neil Brown
a1d3501313
Changed the QuickCheck tests to test that we can get the exact answer from a full equality set, and rather ham-fistedly fixed a bug where substitutions were being applied multiple times to the variable mapping
2007-12-16 00:33:27 +00:00
Neil Brown
d5461bb10b
Moved the norm helper to be a top-level function in the tests
2007-12-15 03:19:25 +00:00
Neil Brown
3e4e5355ff
Changed the VariableMapping mess into a more correct mess
2007-12-15 02:58:08 +00:00