summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-07-18 08:04:29 +0000
committerpaltherr <paltherr@epfl.ch>2003-07-18 08:04:29 +0000
commit85a93fa145aaef49d434d05903310a9e5170affa (patch)
treed441f75a9a4966920ac29b2116949f35551e84b1 /test
parent9500f0c78cc43d89e4c23e881449e62b681ae578 (diff)
downloadscala-85a93fa145aaef49d434d05903310a9e5170affa.tar.gz
scala-85a93fa145aaef49d434d05903310a9e5170affa.tar.bz2
scala-85a93fa145aaef49d434d05903310a9e5170affa.zip
- Removed duplicates
Diffstat (limited to 'test')
-rw-r--r--test/files/pos/cours1.scala54
-rw-r--r--test/files/pos/cours2.scala128
-rw-r--r--test/files/pos/cours2c.scala57
-rw-r--r--test/pos/cours1.scala54
-rw-r--r--test/pos/cours2.scala128
-rw-r--r--test/pos/cours2c.scala57
6 files changed, 0 insertions, 478 deletions
diff --git a/test/files/pos/cours1.scala b/test/files/pos/cours1.scala
deleted file mode 100644
index 2dc3ac6238..0000000000
--- a/test/files/pos/cours1.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-object test {
-
- def size = 2;
- def pi = 3.14159;
- def radius = 10;
- def circumference = 2 * pi * radius;
- def square(x: Double) = x * x;
- def sumOfSquares(x: Double, y: Double) = square(x) + square(y);
- def loop: Int = loop;
- def first(x: Int, y: Int) = x;
- def constOne(x: Int, def y: Int) = 1;
- def abs(x: Double) = if (x >= 0) x else -x;
-
- def sqrtIter0(guess: Double, x: Double): Double =
- if (isGoodEnough0(guess, x)) guess
- else sqrtIter0(improve0(guess, x), x);
- def improve0(guess: Double, x: Double) =
- (guess + x / guess) / 2;
- def isGoodEnough0(guess: Double, x: Double) =
- abs(square(guess) - x) < 0.001;
- def sqrt0(x: Double) = sqrtIter0(1.0, x);
-
- def sqrt1(x: Double) = {
- def sqrtIter1(guess: Double, x: Double): Double =
- if (isGoodEnough1(guess, x)) guess
- else sqrtIter1(improve1(guess, x), x);
-
- def improve1(guess: Double, x: Double) =
- (guess + x / guess) / 2;
-
- def isGoodEnough1(guess: Double, x: Double) =
- abs(square(guess) - x) < 0.001;
-
- sqrtIter1(1.0, x);
- }
-
- def sqrt2(x: Double) = {
- def sqrtIter2(guess: Double): Double =
- if (isGoodEnough2(guess)) guess
- else sqrtIter2(improve2(guess));
-
- def improve2(guess: Double) =
- (guess + x / guess) / 2;
-
- def isGoodEnough2(guess: Double) =
- abs(square(guess) - x) < 0.001;
-
- sqrtIter2(1.0);
- }
-
- sqrt0(2);
- sqrt1(2);
- sqrt2(2);
-} \ No newline at end of file
diff --git a/test/files/pos/cours2.scala b/test/files/pos/cours2.scala
deleted file mode 100644
index c96f588791..0000000000
--- a/test/files/pos/cours2.scala
+++ /dev/null
@@ -1,128 +0,0 @@
-object m1 {
-
- def id(x: Int): Double = x;
- def cube(x: Int): Double = x * x * x;
- def reciprocal(x: Int): Double = 1.0/x;
-
- def sumInts(a: Int, b: Int): Double =
- if (a > b) 0
- else a + sumInts(a + 1, b);
-
- def sumCubes(a: Int, b: Int): Double =
- if (a > b) 0
- else cube(a) + sumCubes(a + 1, b);
-
- def sumReciprocals(a: Int, b: Int): Double =
- if (a > b) 0
- else 1.0/a + sumReciprocals(a, b);
-
-}
-
-object m2 {
-
- def id(x: Int): Double = x;
- def cube(x: Int): Double = x * x * x;
- def reciprocal(x: Int): Double = 1.0/x;
-
- def sum(f: Int => Double, a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sum(f, a + 1, b);
-
- def sumInts(a: Int, b: Int): Double = sum(id, a, b);
- def sumCubes(a: Int, b: Int): Double = sum(cube, a, b);
- def sumReciprocals(a: Int, b: Int): Double = sum(reciprocal, a, b);
-}
-
-object m3 {
-
- def sum(f: Int => Double, a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sum(f, a + 1, b);
-
- def sumInts(a: Int, b: Int): Double = sum((x => x), a, b);
- def sumCubes(a: Int, b: Int): Double = sum((x => x * x * x), a, b);
- def sumReciprocals(a: Int, b: Int): Double = sum((x => 1.0/x), a, b);
-}
-
-object m4 {
-
- def sum(f: Int => Double) = {
- def sumF(a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sumF(a + 1, b);
- sumF
- }
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m5 {
-
- def sum(f: Int => Double): (Int, Int) => Double = (a, b) =>
- if (a > b) 0
- else f(a) + sum(f)(a + 1, b);
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m6 {
-
- def sum(f: Int => Double)(a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sum(f)(a + 1, b);
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m7 {
-
- def sum(f: Int => Double)(a: Int, b: Int): Double = {
- def iter(a: Int, result: Double): Double =
- if (a > b) result
- else iter(a + 1, f(a) + result);
- iter(a, 0);
- }
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m8 {
-
- def product(f: Int => Double)(a: Int, step: Int, b: Int): Double =
- if (a > b) 1
- else f(a) * product(f)(a + step, step, b);
-
- val pi = 8 * product(x => x * x)(4, 2, 40) / product(x => x * x)(3, 2, 40);
-}
-
-object m9 {
-
- def accumulate[t](combiner: (t, t) => t, nullValue: t, f: Int => t, next: Int => Int)
- (a: Int, b: Int): t =
- if (a > b) nullValue
- else combiner(f(a), accumulate(combiner, nullValue, f, next)(next(a), b));
-
- def inc(x: Int) = x + 1;
-
- def sum(f: Int => Double) =
- accumulate((x: Double, y: Double) => x + y, 0, f, inc);
- def product(f: Int => Double) =
- accumulate((x: Double, y: Double) => x * y, 1, f, inc);
-}
-
diff --git a/test/files/pos/cours2c.scala b/test/files/pos/cours2c.scala
deleted file mode 100644
index e3917e43eb..0000000000
--- a/test/files/pos/cours2c.scala
+++ /dev/null
@@ -1,57 +0,0 @@
-object m1 {
-
- def average(x: Double, y: Double) = (x + y)/2;
- def abs(x: Double): Double = if (x < 0) - x else x;
- def isCloseEnough(x: Double, y: Double) = abs((x - y) / x) < 0.001;
-
- def search(f: Double => Double, negPoint: Double, posPoint: Double): Double = {
- val midPoint = average(negPoint, posPoint);
- if (isCloseEnough(negPoint, posPoint))
- midPoint
- else {
- val testVal = f(midPoint);
- if (testVal > 0) search (f, negPoint, midPoint)
- else if (testVal < 0) search (f, midPoint, posPoint)
- else midPoint
- }
- }
-
- def halfIntervalMethod(f: Double => Double, a: Double, b: Double): Double = {
- val aval = f(a);
- val bval = f(b);
- if (aval < 0 && bval > 0) search(f, a, b)
- else if (bval < 0 && aval > 0) search(f, b, a)
- else error("Values are not of opposite sign")
- }
-}
-
-object m2 {
-
- def abs(x: Double): Double = if (x < 0) - x else x;
- def isCloseEnough(x: Double, y: Double) = abs((x - y) / x) < 0.001;
- def average(x: Double, y: Double) = (x + y)/2;
-
- def fixedPoint(f: Double => Double, firstGuess: Double) = {
- def Try(guess: Double): Double = {
- val next = f(guess);
- if (isCloseEnough(guess, next)) next
- else Try(next)
- }
- Try(firstGuess);
- }
-
- def sin(x: Double): Double = x;
- def cos(x: Double): Double = x;
-
- val result = fixedPoint((y => sin(y) + cos(y)), 1.0);
-
- def averageDamp(f: Double => Double)(x: Double) =
- average(x, f(x));
-
- def sqrt(x: Double) =
- fixedPoint(averageDamp(y => x/y), 1.0);
-
- def cubeRoot(x: Double) =
- fixedPoint(averageDamp(y => x/(y*y)), 1.0);
-}
-
diff --git a/test/pos/cours1.scala b/test/pos/cours1.scala
deleted file mode 100644
index 2dc3ac6238..0000000000
--- a/test/pos/cours1.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-object test {
-
- def size = 2;
- def pi = 3.14159;
- def radius = 10;
- def circumference = 2 * pi * radius;
- def square(x: Double) = x * x;
- def sumOfSquares(x: Double, y: Double) = square(x) + square(y);
- def loop: Int = loop;
- def first(x: Int, y: Int) = x;
- def constOne(x: Int, def y: Int) = 1;
- def abs(x: Double) = if (x >= 0) x else -x;
-
- def sqrtIter0(guess: Double, x: Double): Double =
- if (isGoodEnough0(guess, x)) guess
- else sqrtIter0(improve0(guess, x), x);
- def improve0(guess: Double, x: Double) =
- (guess + x / guess) / 2;
- def isGoodEnough0(guess: Double, x: Double) =
- abs(square(guess) - x) < 0.001;
- def sqrt0(x: Double) = sqrtIter0(1.0, x);
-
- def sqrt1(x: Double) = {
- def sqrtIter1(guess: Double, x: Double): Double =
- if (isGoodEnough1(guess, x)) guess
- else sqrtIter1(improve1(guess, x), x);
-
- def improve1(guess: Double, x: Double) =
- (guess + x / guess) / 2;
-
- def isGoodEnough1(guess: Double, x: Double) =
- abs(square(guess) - x) < 0.001;
-
- sqrtIter1(1.0, x);
- }
-
- def sqrt2(x: Double) = {
- def sqrtIter2(guess: Double): Double =
- if (isGoodEnough2(guess)) guess
- else sqrtIter2(improve2(guess));
-
- def improve2(guess: Double) =
- (guess + x / guess) / 2;
-
- def isGoodEnough2(guess: Double) =
- abs(square(guess) - x) < 0.001;
-
- sqrtIter2(1.0);
- }
-
- sqrt0(2);
- sqrt1(2);
- sqrt2(2);
-} \ No newline at end of file
diff --git a/test/pos/cours2.scala b/test/pos/cours2.scala
deleted file mode 100644
index c96f588791..0000000000
--- a/test/pos/cours2.scala
+++ /dev/null
@@ -1,128 +0,0 @@
-object m1 {
-
- def id(x: Int): Double = x;
- def cube(x: Int): Double = x * x * x;
- def reciprocal(x: Int): Double = 1.0/x;
-
- def sumInts(a: Int, b: Int): Double =
- if (a > b) 0
- else a + sumInts(a + 1, b);
-
- def sumCubes(a: Int, b: Int): Double =
- if (a > b) 0
- else cube(a) + sumCubes(a + 1, b);
-
- def sumReciprocals(a: Int, b: Int): Double =
- if (a > b) 0
- else 1.0/a + sumReciprocals(a, b);
-
-}
-
-object m2 {
-
- def id(x: Int): Double = x;
- def cube(x: Int): Double = x * x * x;
- def reciprocal(x: Int): Double = 1.0/x;
-
- def sum(f: Int => Double, a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sum(f, a + 1, b);
-
- def sumInts(a: Int, b: Int): Double = sum(id, a, b);
- def sumCubes(a: Int, b: Int): Double = sum(cube, a, b);
- def sumReciprocals(a: Int, b: Int): Double = sum(reciprocal, a, b);
-}
-
-object m3 {
-
- def sum(f: Int => Double, a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sum(f, a + 1, b);
-
- def sumInts(a: Int, b: Int): Double = sum((x => x), a, b);
- def sumCubes(a: Int, b: Int): Double = sum((x => x * x * x), a, b);
- def sumReciprocals(a: Int, b: Int): Double = sum((x => 1.0/x), a, b);
-}
-
-object m4 {
-
- def sum(f: Int => Double) = {
- def sumF(a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sumF(a + 1, b);
- sumF
- }
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m5 {
-
- def sum(f: Int => Double): (Int, Int) => Double = (a, b) =>
- if (a > b) 0
- else f(a) + sum(f)(a + 1, b);
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m6 {
-
- def sum(f: Int => Double)(a: Int, b: Int): Double =
- if (a > b) 0
- else f(a) + sum(f)(a + 1, b);
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m7 {
-
- def sum(f: Int => Double)(a: Int, b: Int): Double = {
- def iter(a: Int, result: Double): Double =
- if (a > b) result
- else iter(a + 1, f(a) + result);
- iter(a, 0);
- }
-
- def sumInts = sum(x => x);
- def sumCubes = sum(x => x * x * x);
- def sumReciprocals = sum(x => 1.0/x);
-
- sumCubes(1, 10) + sumReciprocals(10, 20);
-}
-
-object m8 {
-
- def product(f: Int => Double)(a: Int, step: Int, b: Int): Double =
- if (a > b) 1
- else f(a) * product(f)(a + step, step, b);
-
- val pi = 8 * product(x => x * x)(4, 2, 40) / product(x => x * x)(3, 2, 40);
-}
-
-object m9 {
-
- def accumulate[t](combiner: (t, t) => t, nullValue: t, f: Int => t, next: Int => Int)
- (a: Int, b: Int): t =
- if (a > b) nullValue
- else combiner(f(a), accumulate(combiner, nullValue, f, next)(next(a), b));
-
- def inc(x: Int) = x + 1;
-
- def sum(f: Int => Double) =
- accumulate((x: Double, y: Double) => x + y, 0, f, inc);
- def product(f: Int => Double) =
- accumulate((x: Double, y: Double) => x * y, 1, f, inc);
-}
-
diff --git a/test/pos/cours2c.scala b/test/pos/cours2c.scala
deleted file mode 100644
index e3917e43eb..0000000000
--- a/test/pos/cours2c.scala
+++ /dev/null
@@ -1,57 +0,0 @@
-object m1 {
-
- def average(x: Double, y: Double) = (x + y)/2;
- def abs(x: Double): Double = if (x < 0) - x else x;
- def isCloseEnough(x: Double, y: Double) = abs((x - y) / x) < 0.001;
-
- def search(f: Double => Double, negPoint: Double, posPoint: Double): Double = {
- val midPoint = average(negPoint, posPoint);
- if (isCloseEnough(negPoint, posPoint))
- midPoint
- else {
- val testVal = f(midPoint);
- if (testVal > 0) search (f, negPoint, midPoint)
- else if (testVal < 0) search (f, midPoint, posPoint)
- else midPoint
- }
- }
-
- def halfIntervalMethod(f: Double => Double, a: Double, b: Double): Double = {
- val aval = f(a);
- val bval = f(b);
- if (aval < 0 && bval > 0) search(f, a, b)
- else if (bval < 0 && aval > 0) search(f, b, a)
- else error("Values are not of opposite sign")
- }
-}
-
-object m2 {
-
- def abs(x: Double): Double = if (x < 0) - x else x;
- def isCloseEnough(x: Double, y: Double) = abs((x - y) / x) < 0.001;
- def average(x: Double, y: Double) = (x + y)/2;
-
- def fixedPoint(f: Double => Double, firstGuess: Double) = {
- def Try(guess: Double): Double = {
- val next = f(guess);
- if (isCloseEnough(guess, next)) next
- else Try(next)
- }
- Try(firstGuess);
- }
-
- def sin(x: Double): Double = x;
- def cos(x: Double): Double = x;
-
- val result = fixedPoint((y => sin(y) + cos(y)), 1.0);
-
- def averageDamp(f: Double => Double)(x: Double) =
- average(x, f(x));
-
- def sqrt(x: Double) =
- fixedPoint(averageDamp(y => x/y), 1.0);
-
- def cubeRoot(x: Double) =
- fixedPoint(averageDamp(y => x/(y*y)), 1.0);
-}
-