diff options
| author | Matthias Wisniowski <matthias.wisniowski@gmail.com> | 2012-03-24 16:32:54 +0100 |
|---|---|---|
| committer | Matthias Wisniowski <matthias.wisniowski@gmail.com> | 2012-03-24 16:32:54 +0100 |
| commit | eba9949e83a6ff834c8ebaa68dd136ea005d2351 (patch) | |
| tree | b53fec58387e2c30aa251c92a3c44f5fe3cf237d /AufgabeFFP1.hs | |
| parent | 190dea09058bebd071fdb107d23834efefcdc030 (diff) | |
| parent | 416dc0ed6ff074203b08c764b9526caede66644c (diff) | |
| download | ffp-eba9949e83a6ff834c8ebaa68dd136ea005d2351.tar.gz ffp-eba9949e83a6ff834c8ebaa68dd136ea005d2351.tar.bz2 ffp-eba9949e83a6ff834c8ebaa68dd136ea005d2351.zip | |
Merge branch 'master' of ssh://git.manuel.mausz.at:2211/ffp
Conflicts:
AufgabeFFP1.hs
Diffstat (limited to 'AufgabeFFP1.hs')
| -rw-r--r-- | AufgabeFFP1.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AufgabeFFP1.hs b/AufgabeFFP1.hs index 648c773..53e5fb7 100644 --- a/AufgabeFFP1.hs +++ b/AufgabeFFP1.hs | |||
| @@ -19,7 +19,7 @@ pof2s = 1:(map (2*) pof2s) | |||
| 19 | -- alternate: | 19 | -- alternate: |
| 20 | -- calculates 2^ with each element of the continuous list | 20 | -- calculates 2^ with each element of the continuous list |
| 21 | -- pof2s :: [Integer] | 21 | -- pof2s :: [Integer] |
| 22 | -- pof2s = map (2^) [0,1..] | 22 | -- pof2s = map (2^) [0..] |
| 23 | 23 | ||
| 24 | -- alternate 2: | 24 | -- alternate 2: |
| 25 | -- pof2s :: [Integer] | 25 | -- pof2s :: [Integer] |