diff options
| author |  rustanleino <unknown> | 2010-06-24 00:41:04 +0000 |
|---|---|---|
| committer | rustanleino <unknown> | 2010-06-24 00:41:04 +0000 |
| commit | 91e342b0d241b5aed7721032e8cac1947b903fea (patch) | |
| tree | 181bbe7b78069863736396ffc8ab3b074ab18345 /Test/dafny1 | |
| parent | 542a290247321b02f71ba9078751b5279ad3ff6e (diff) | |
Dafny:
* For every loop decreases clause N, generate a free loop invariant N <= N0, where N0 is the value of N just before the loop.
* Added Test/dafny1/KatzManna.dfy, which contains the 3 programs (and their termination annotations) from the Katz and Manna 1975 paper "A closer look at termination" (which benefits from the feature above).
Diffstat (limited to 'Test/dafny1')
| -rw-r--r-- | Test/dafny1/Answer | 4 | ||||
| -rw-r--r-- | Test/dafny1/KatzManna.dfy | 85 | ||||
| -rw-r--r-- | Test/dafny1/runtest.bat | 2 |
3 files changed, 90 insertions, 1 deletions
diff --git a/Test/dafny1/Answer b/Test/dafny1/Answer index cf593abf..d2e621c5 100644 --- a/Test/dafny1/Answer +++ b/Test/dafny1/Answer @@ -47,6 +47,10 @@ Dafny program verifier finished with 12 verified, 0 errors Dafny program verifier finished with 6 verified, 0 errors
+-------------------- KatzManna.dfy --------------------
+
+Dafny program verifier finished with 8 verified, 0 errors
+
-------------------- Celebrity.dfy --------------------
Dafny program verifier finished with 11 verified, 0 errors
diff --git a/Test/dafny1/KatzManna.dfy b/Test/dafny1/KatzManna.dfy new file mode 100644 index 00000000..0f03afec --- /dev/null +++ b/Test/dafny1/KatzManna.dfy @@ -0,0 +1,85 @@ +method NinetyOne(x: int) returns (z: int)
+ requires 0 <= x;
+// ensures z == (if x > 101 then x-10 else 91);
+{
+ var y1 := x;
+ var y2 := 1;
+ while (true)
+ invariant (y1 <= 111 && y2 >= 1) || (y1 == x && y2 == 1);
+ decreases -2*y1 + 21*y2 + 2*(if x < 111 then 111 else x);
+ {
+ if (y1 > 100) {
+ if (y2 == 1) {
+ break;
+ } else {
+ y1 := y1 - 10;
+ y2 := y2 - 1;
+ }
+ } else {
+ y1 := y1 + 11;
+ y2 := y2 + 1;
+ }
+ }
+ z := y1 - 10;
+}
+
+method Gcd(x1: int, x2: int)
+ requires 1 <= x1 && 1 <= x2;
+{
+ var y1 := x1;
+ var y2 := x2;
+ while (y1 != y2)
+ invariant 1 <= y1 && 1 <= y2;
+ decreases y1 + y2;
+ {
+ while (y1 > y2)
+ invariant 1 <= y1 && 1 <= y2;
+ {
+ y1 := y1 - y2;
+ }
+ while (y2 > y1)
+ invariant 1 <= y1 && 1 <= y2;
+ {
+ y2 := y2 - y1;
+ }
+ }
+}
+
+method Determinant(X: Matrix, M: int) returns (z: int)
+ requires 1 <= M;
+ requires X != null && M == X.Size;
+{
+ var y := X.Get(1,1);
+ var a := 1;
+ while (a != M)
+ invariant 1 <= a && a <= M;
+ {
+ var b := a + 1;
+ while (b != M+1)
+ invariant a+1 <= b && b <= M+1;
+ {
+ var c := M;
+ while (c != a)
+ invariant a <= c && c <= M;
+ {
+ assume X.Get(a,a) != 0;
+ call X.Set(b, c, X.Get(b,c) - X.Get(b,a) / X.Get(a,a) * X.Get(a,c));
+ c := c - 1;
+ }
+ b := b + 1;
+ }
+ a := a + 1;
+ y := y * X.Get(a,a);
+ }
+ z := y;
+}
+
+class Matrix {
+ ghost var Size: int;
+ function method Get(i: int, j: int): int;
+ requires 1 <= i && i <= Size;
+ requires 1 <= j && j <= Size;
+ method Set(i: int, j: int, x: int);
+ requires 1 <= i && i <= Size;
+ requires 1 <= j && j <= Size;
+}
diff --git a/Test/dafny1/runtest.bat b/Test/dafny1/runtest.bat index aab76ff9..948eedc1 100644 --- a/Test/dafny1/runtest.bat +++ b/Test/dafny1/runtest.bat @@ -17,7 +17,7 @@ for %%f in (Queue.dfy ListCopy.dfy ListReverse.dfy ListContents.dfy
SchorrWaite.dfy
SumOfCubes.dfy
- TerminationDemos.dfy Substitution.dfy TreeDatatype.dfy
+ TerminationDemos.dfy Substitution.dfy TreeDatatype.dfy KatzManna.dfy
Celebrity.dfy
UltraFilter.dfy) do (
echo.
|