Merge jv
authorMerge Script
Thu, 10 Dec 2015 06:39:39 +0100
branchjv
changeset 18983 9f3e91ff6418
parent 18980 0a746c7af899 (current diff)
parent 18982 ca1ba3a8fa67 (diff)
child 18987 e336d940d02d
Merge
AbstractOperatingSystem.st
Integer.st
--- a/AbstractOperatingSystem.st	Tue Dec 08 06:40:56 2015 +0100
+++ b/AbstractOperatingSystem.st	Thu Dec 10 06:39:39 2015 +0100
@@ -907,15 +907,15 @@
 shuffleAllFrom:anInStream to:anOutStream lineWise:lineWise lockWith:aLock
 
     lineWise ifFalse:[
-	^ anInStream copyToEndInto:anOutStream.
+        ^ anInStream copyToEndInto:anOutStream.
     ].
-    [anInStream atEnd] whileFalse:[
-	aLock critical:[
-	    self
-		shuffleFrom:anInStream
-		to:anOutStream
-		lineWise:lineWise
-	]
+    [anInStream isOpen and:[anInStream atEnd not]] whileTrue:[
+        aLock critical:[
+            self
+                shuffleFrom:anInStream
+                to:anOutStream
+                lineWise:lineWise
+        ]
     ]
 !
 
--- a/Integer.st	Tue Dec 08 06:40:56 2015 +0100
+++ b/Integer.st	Thu Dec 10 06:39:39 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1988 by Claus Gittinger
               All Rights Reserved
@@ -3006,7 +3004,7 @@
     ^ fibUsingDict value:self
 
     "the running time is mostly dictated by the LargeInteger multiplication performance...
-     (therefore, we get O² execution times, even for a linear number of multiplications)
+     (therefore, we get O(n²) execution times, even for a linear number of multiplications)
 
      Time millisecondsToRun:[50000 fib_iterative]  312    (DUO 1.7Ghz CPU)
      Time millisecondsToRun:[50000 fib_helper]     109