hg/stx-libbasic: comparison Collection.st

equal deleted inserted replaced

-:a8a04402986c
+:8b5df02e171f
 !Collection methodsFor:'bulk operations'!
 abs
 "absolute value of all elements in the collection"
-^ self collect: [:a | a abs]
+^ self collect:[:a | a abs]
 "
-TestCase assert:( { 1. -2. -3. 4 } abs = { 1. 2. 3. 4 }).
+TestCase assert:( #(1 -2 -3 4) abs = #(1 2 3 4)).
 "
 "Modified: / 18-03-2011 / 10:33:50 / cg"
 !
 "negated value of all elements in the collection"
 ^ self collect:[:a | a negated]
 "
-TestCase assert:( { 1. -2. -3. 4 } negated = { -1. 2. 3. -4 }).
+TestCase assert:( #(1 -2 -3 4) negated = #(-1 2 3 -4)).
 "
 "Modified: / 18-03-2011 / 10:33:53 / cg"
 !
 product
 "multiply up all elements."
-self emptyCheck.
 ^ self
-inject:(self first class unity)
+fold:[:accum :each | accum * each].
-into:[:accum :each | accum * each].
+"
-"
+TestCase should:[ Array new product ] raise:Error.
-TestCase should:[ Array new sum ] raise:Error.
+TestCase assert:( #(1) product == 1).
-TestCase assert:( { 1 } product == 1).
+TestCase assert:( #(6) product == 6).
-TestCase assert:( { 6 } product == 6).
+TestCase assert:( #(1 2 3 4 5) product = 5 factorial )
-TestCase assert:( { 1. 2. 3. 4. 5. } product = 5 factorial )
 "
 !
 sum
 "sum up all elements; return 0 for an empty collection."
 self isEmpty ifTrue:[^ 0].
 ^ self
-inject:(self first class zero)
+fold:[:accum :each | accum + each].
-into:[:accum :each | accum + each].
+"
+TestCase assert: ( #() sum = 0 ).
-"
+TestCase assert: ( #(1) sum = 1 ).
-TestCase assert: ( {  } sum = 0 ).
+TestCase assert: ( #(1 2 3 4) sum = 10 ).
-TestCase assert: ( { 1 } sum = 1 ).
-TestCase assert: ( { 1. 2. 3. 4. } sum = 10 ).
 TestCase assert: ( (1 to:10) sum = 55 ).
 TestCase assert: ( 'abc' asByteArray sum = 294 ).
 TestCase assert: ( { 10 +/- 2.
 20 +/- 4.
 100 +/- 10 } sum = (130 +/- 16) ).
 ].
 ].
 ^ sum ? 0
 "
-((1 to:10) collect:[:n | n squared]) sum
+TestCase assert:(
-((1 to:10) sum:[:n | n squared])
+((1 to:10) collect:[:n | n squared]) sum = ((1 to:10) sum:[:n | n squared])
+)
 "
 "Modified: / 23-08-2010 / 18:19:42 / cg"
 ! !
 !
 asSet
 "return a new Set with the receiver collections elements"
-^ self addAllNonNilElementsTo:(Set new:self size)
+^ self addAllTo:(Set new:self size)
 !
 asSharedCollection
 "return a shared collection on the receiver.
 This implements synchronized access to me."
 "Evaluate the block with the first two elements of the receiver,
 then with the result of the first evaluation and the next element,
 and so on.  Answer the result of the final evaluation. If the receiver
 is empty, raise an error. If the receiver has a single element, answer
 that element.
-See also: inject:into:"
+Here the reduction is done from left to right.
+See also: #inject:into: #reduce:"
 | first nextValue |
-self emptyCheck.
 first := true.
 self do:[:each |
-nextValue := first
+first
-ifTrue: [first := false. each]
+ifTrue: [first := false. nextValue := each]
-ifFalse: [binaryBlock value: nextValue value: each]
+ifFalse: [nextValue := binaryBlock value:nextValue value:each]
+].
+first ifTrue:[
+^ self emptyCollectionError.
 ].
 ^ nextValue
 "
+(1 to:15) fold:[:x :y| '(', x printString, '+', y printString, ')']
+(1 to:15) reduce:[:x :y| '(', x printString, '+', y printString, ')']
 #('if' 'it' 'is' 'to' 'be' 'it' 'is' 'up' 'to' 'me') fold: [:a :b | a, ' ', b]
+#('if' 'it' 'is' 'to' 'be' 'it' 'is' 'up' 'to' 'me') reduce: [:a :b | a, ' ', b]
 "
 "Created: / 14-09-2011 / 16:29:53 / cg"
 !
 inject:thisValue into:binaryBlock
 "starting with thisValue for value, pass this value and each element
 to binaryBlock, replacing value with the result returned from the block
-in the next iteration."
+in the next iteration.
+See also: #fold: #reduce:"
 |nextValue|
 nextValue := thisValue.
 self do: [:each | nextValue := binaryBlock value:nextValue value:each].
 "
 "Created: / 20-07-2011 / 00:54:41 / cg"
 !
-reduce:aTwoArgBlock
+reduce:binaryBlock
-"reduce by iteratively applying aTwoArgBlock to the result from the
+"Evaluate the block with the first two elements of the receiver,
-previous reduce and an element.
+then with the result of the first evaluation and the next element,
-The first evaluation is on the first two elements."
+and so on.  Answer the result of the final evaluation. If the receiver
+is empty, raise an error. If the receiver has a single element, answer
-|first|
+that element.
-self emptyCheck.
+Here the reduction is done from right to left.
+See also: #inject:into: #fold:"
+| first nextValue |
 first := true.
-^ self
+self do:[:each |
-inject:nil
+first
-into:[:accu :el |
+ifTrue: [first := false. nextValue := each]
-first ifTrue:[
+ifFalse: [nextValue := binaryBlock value:each value:nextValue]
-first := false.
+].
-el
+first ifTrue:[
-] ifFalse:[
+^ self emptyCollectionError.
-aTwoArgBlock value:el value:accu
+].
-]
+^ nextValue
-]
+"
-"
+(1 to:15) reduce:[:x :y| '(', x printString, '+', y printString, ')']
+(1 to:15) fold:[:x :y| '(', x printString, '+', y printString, ')']
+#('if' 'it' 'is' 'to' 'be' 'it' 'is' 'up' 'to' 'me') reduce: [:a :b | a, ' ', b]
+#('if' 'it' 'is' 'to' 'be' 'it' 'is' 'up' 'to' 'me') fold: [:a :b | a, ' ', b]
 #(10 1 2 3) reduce:[:el :diff | diff - el]
 #(10 1 2 3) reduce:[:el :diff | diff + el]
 "
 "Created: / 28-02-2012 / 21:16:33 / cg"
 !
 reduceLeft:aTwoArgBlock
-"reduce by iteratively applying aTwoArgBlock to an element and the result from the
+^ self fold:aTwoArgBlock
-previous reduce. The first evaluation is on the first two elements."
-|first|
-self emptyCheck.
-first := true.
-^ self
-inject:nil
-into:[:accu :el |
-first ifTrue:[
-first := false.
-el
-] ifFalse:[
-aTwoArgBlock value:accu value:el
-]
-]
 "
 #(1 2 3 4 5) reduceLeft:[:sum :el | sum + el]
 "
 (5 five #'fuenf')
 (6 six sechs)
 )
 triplesDo:[:num :sym1 :sym2 |
 Transcript show:num; space; show:sym1; space; showCR:sym2
+]
+"
+"Modified: 10.5.1997 / 14:15:43 / cg"
+!
+tuplesDo:aBlock
+"evaluate the argument, aBlock for every element in the collection,
+which is supposed to consist of N-element collections.
+The block is called with N arguments for each collection in the receiver."
+self do:[:aTuple |
+aBlock valueWithArguments:aTuple
+]
+"
+#(
+(1 one eins uno)
+(2 two zwei due)
+(3 three drei tre)
+(4 four vier quattro)
+(5 five #'fuenf' cinque)
+)
+tuplesDo:[:num :sym1 :sym2 :sym3 |
+Transcript show:num; space; show:sym1; space; show:sym2; space; showCR:sym3
 ]
 "
 "Modified: 10.5.1997 / 14:15:43 / cg"
 !
 ! !
 !Collection methodsFor:'error handling'!
 emptyCheck
-"check if the receiver is empty; report an error if so"
+"check if the receiver is empty; report an error if so.
+CAVEAT: Set redefines #emptySet with a different meaning,
+so calling this for a Set or a Dictionary does not show the
+expected behaviour!!"
 self isEmpty ifTrue:[
 ^ self emptyCollectionError.
 ].
 !
 !
 displayStringName
 "redefinable helper for displayString"
-^ (self class name)
+^ self class name
 "Created: / 2.2.1999 / 22:39:33 / cg"
 !
 maxPrint
 max
 "return the maximum value in the receiver collection,
 using #< to compare elements.
 Raises an error, if the receiver is empty."
-self emptyCheck.
 ^ self
-inject:nil
+fold:[:maxSoFar :each |
-into:[:maxSoFar :this |
+maxSoFar < each
-(maxSoFar isNil or:[maxSoFar < this])
+ifTrue:[each]
-ifTrue:[this]
 ifFalse:[maxSoFar]
 ]
 "
 #(15 1 -9 10 5) max
 maxApplying:aBlock
 "return the maximum value from applying aBlock to each element in the receiver collection,
 using aBlock to compare elements.
 Raises an error, if the receiver is empty."
-self emptyCheck.
+|ret|
-^ self
+ret := self
 inject:nil
 into:[:maxSoFar :this |
 |v|
 v := aBlock value:this.
 (maxSoFar isNil or:[maxSoFar < v])
 ifTrue:[v]
 ifFalse:[maxSoFar]
-]
+].
-"
+ret isNil ifTrue:[
+^ self emptyCollectionError.
+].
+^ ret.
+"
+#() max                                        -> Error
 #(15 1 -9 -20 10 5) max                        -> 15
 #(15 1 -9 -20 10 5) maxApplying:[:el | el abs] -> 20
 "
 "Created: / 23-08-2010 / 11:02:50 / cg"
 min
 "return the minimum value in the receiver collection,
 using < to compare elements.
 Raises an error, if the receiver is empty."
-self emptyCheck.
 ^ self
-inject:nil
+fold:[:minSoFar :each |
-into:[:minSoFar :this |
+each < minSoFar
-(minSoFar isNil or:[this < minSoFar])
+ifTrue:[each]
-ifTrue:[this]
 ifFalse:[minSoFar]
 ]
 "
 #(15 1 -9 10 5) min
 minApplying:aBlock
 "return the minimum value from applying aBlock to each element in the receiver collection,
 using aBlock to compare elements.
 Raises an error, if the receiver is empty."
-self emptyCheck.
+|ret|
-^ self
+ret := self
 inject:nil
 into:[:minSoFar :this |
 |v|
 v := aBlock value:this.
 (minSoFar isNil or:[v < minSoFar])
 ifTrue:[v]
 ifFalse:[minSoFar]
-]
+].
+ret isNil ifTrue:[
+^ self emptyCollectionError.
+].
+^ ret.
 "
 #(15 -1 -9 10 5) min                        -> -9
 #(15 -1 -9 10 5) minApplying:[:el | el abs] -> 1
 "
 "return the minimum and maximum values in the receiver collection
 as a two element array, using #< to compare elements.
 Raises an error, if the receiver is empty."
 |min max|
-self emptyCheck.
 min := max := nil.
 self do:[:each |
 min isNil ifTrue:[
 min := max := each
 min := each
 ]
 ]
 ]
 ].
+min isNil ifTrue:[
+^ self emptyCollectionError.
+].
 ^ Array with:min with:max
 "
 #(15 1 -9 10 5) minMax
 (1 to:15) minMax
 m := self arithmeticMean.
 sumDeltaSquares := self inject:0 into:[:sum :this | sum + ((this - m) squared)].
 ^ (sumDeltaSquares / (self size - 1)) sqrt
 "
-TestCase assert:( { 1. 2. 3. 4 } arithmeticMean = 2.5).
+TestCase assert:( #( 1 2 3 4) arithmeticMean = 2.5).
-TestCase assert:( { 13. 23. 12. 44. 55 } arithmeticMean closeTo: 29.4).
+TestCase assert:( #(13 23 12 44 55) arithmeticMean closeTo: 29.4).
-TestCase assert:( { 13. 23. 12. 44. 55 } standardDeviation closeTo: 19.2431).
+TestCase assert:( #(13 23 12 44 55) standardDeviation closeTo: 19.2431).
 "
 "Created: / 13-04-2011 / 17:58:47 / cg"
 ! !
 ! !
 !Collection class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.276 2012/07/20 13:05:23 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/Collection.st,v 1.281 2012/08/21 12:49:44 cg Exp $'
 !
 version_CVS
-^ '�Header: /cvs/stx/stx/libbasic/Collection.st,v 1.276 2012/07/20 13:05:23 cg Exp �'
+^ '�Header: /cvs/stx/stx/libbasic/Collection.st,v 1.281 2012/08/21 12:49:44 cg Exp �'
 !
 version_SVN
-^ '$Id: Collection.st 10829 2012-07-25 08:45:15Z vranyj1 $'
+^ '$Id: Collection.st 10844 2012-09-07 16:24:32Z vranyj1 $'
 ! !
 Collection initialize!

branch	jv
changeset 17966	8b5df02e171f
parent 17955	f5ee690b1a27
child 17976	50c2416f962a