hg/stx-libbasic: comparison SortedCollection.st

equal deleted inserted replaced

-:7a9ab63a6757
+:a9a526c51233
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
 !
-version
-^ '$Header: /cvs/stx/stx/libbasic/SortedCollection.st,v 1.21 1995-11-11 15:27:30 cg Exp $'
-!
 documentation
 "
 I keep my elements sorted. The sort order is defined by a sortblock,
 a two-argument block which, when given two elements of the collection,
 should return true if the element given as first arg has to come before the
 Thus a sortBlock of [:a :b | a < b] defines ascending sort-order,
 while [:a :b | a > b] defines descening order.
 The default sortBlock for SortedCollections is the first one.
 "
+!
+version
+^ '$Header: /cvs/stx/stx/libbasic/SortedCollection.st,v 1.22 1995-11-23 01:20:20 cg Exp $'
 ! !
 !SortedCollection class methodsFor:'initialization'!
 initialize
 SortedCollection withAll:#(1 2 3 4 5 6 7 8 9 0)
 		      sortBlock:[:a :b | a > b]
 "
 ! !
-!SortedCollection methodsFor:'copying'!
-copyEmpty:size
-"return a copy of the receiver with no elements, but
-the same size. This method has been be redefined to
-preserve the sortBlock."
-^ (self species new:size) sortBlock:sortBlock
-! !
 !SortedCollection methodsFor:'adding & removing'!
-addFirst:anObject
+add:anObject
-"catch this - its not allowed for sortedCollections"
+"add the argument, anObject at the proper place in the
+receiver. Returns the argument, anObject."
-self shouldNotImplement
-!
+|index|
-addLast:anObject
+lastIndex < firstIndex "i.e. self size == 0" ifTrue:[
-"catch this - its not allowed for sortedCollections"
+	super add:anObject
+] ifFalse:[
-self shouldNotImplement
+	index := self indexForInserting:anObject.
-!
+	self makeRoomAtIndex:index.
+	contentsArray at:index put:anObject
-at:index put:anObject
+].
-"catch this - its not allowed for sortedCollections"
+^ anObject
-self shouldNotImplement
+"
+|c| #(7 3 9 10 99) asSortedCollection add:5; yourself
+#(7 3 9 10 99) asSortedCollection add:1; yourself
+#(7 3 9 10 99) asSortedCollection add:1000; yourself
+"
 !
 add:newObject after:oldObject
 "catch this - its not allowed for sortedCollections"
 "
 #(7 3 9 10 99) asSortedCollection addAll:#(77 0 1 16 5)
 "
 !
-add:anObject
+addFirst:anObject
-"add the argument, anObject at the proper place in the
+"catch this - its not allowed for sortedCollections"
-receiver. Returns the argument, anObject."
+self shouldNotImplement
-|index|
+!
-lastIndex < firstIndex "i.e. self size == 0" ifTrue:[
+addLast:anObject
-	super add:anObject
+"catch this - its not allowed for sortedCollections"
-] ifFalse:[
-	index := self indexForInserting:anObject.
+self shouldNotImplement
-	self makeRoomAtIndex:index.
+!
-	contentsArray at:index put:anObject
-].
+at:index put:anObject
-^ anObject
+"catch this - its not allowed for sortedCollections"
-"
+self shouldNotImplement
-|c| #(7 3 9 10 99) asSortedCollection add:5; yourself
+! !
-#(7 3 9 10 99) asSortedCollection add:1; yourself
-#(7 3 9 10 99) asSortedCollection add:1000; yourself
+!SortedCollection methodsFor:'converting'!
-"
+asSortedCollection
+"return the receiver as a sorted collection"
+"could be an instance of a subclass..."
+self class == SortedCollection ifTrue:[
+	^ self
+].
+^ super asSortedCollection
 ! !
 !SortedCollection methodsFor:'copying'!
+copyEmpty:size
+"return a copy of the receiver with no elements, but
+the same size. This method has been be redefined to
+preserve the sortBlock."
+^ (self species new:size) sortBlock:sortBlock
+!
 postCopyFrom:anOriginal
 "sent after a copy or when a new collection species has been created.
 The new collection should have the same sortBlock as the original."
 (#(4 7 1 99 -1 17) asSortedCollection sortBlock:[:a :b | a > b]) copy inspect
 (#(4 7 1 99 -1 17) asSortedCollection select:[:e| e even]) inspect
 "
 ! !
-!SortedCollection methodsFor:'converting'!
-asSortedCollection
-"return the receiver as a sorted collection"
-"could be an instance of a subclass..."
-self class == SortedCollection ifTrue:[
-	^ self
-].
-^ super asSortedCollection
-! !
 !SortedCollection methodsFor:'enumerating'!
 collect:aBlock
 "evaluate the argument, aBlock for every element in the collection
 and return a collection of the results. Redefined to return an OrderedCollection;
 	newCollection add:(aBlock value:(contentsArray at:index)).
 ].
 ^ newCollection
 ! !
-!SortedCollection methodsFor:'testing'!
-includes:anObject
-"return true, if the argument, anObject is in the collection.
-Redefined, since due to being sorted, the inclusion check can
-be done with log-n compares i.e. much faster."
-|index "{ Class: SmallInteger }"|
-index := self indexForInserting:anObject.
-((index < firstIndex) or:[index > lastIndex]) ifTrue:[^ false].
-^ (contentsArray at:index) = anObject
-"
-#(7 3 9 10 99) asSortedCollection includes:50
-#(7 3 9 10 99) asSortedCollection includes:10
-"
-!
-occurrencesOf:anObject
-"return how many times the argument, anObject is in the collection.
-Redefined, since due to being sorted, the range of checked objects
-can be limited i.e. it can be done much faster."
-|index      "{ Class: SmallInteger }"
-tally      "{ Class: SmallInteger }" |
-index := self indexForInserting:anObject.
-((index < firstIndex) or:[index > lastIndex]) ifTrue:[^ 0].
-tally := 0.
-[(index <= lastIndex) and:[(contentsArray at:index) = anObject]] whileTrue:[
-	tally := tally + 1.
-	index := index + 1
-].
-^ tally
-"
-#(7 3 9 10 99) asSortedCollection occurrencesOf:50
-#(7 3 9 10 99) asSortedCollection occurrencesOf:10
-#(7 10 3 10 9 10 10 99) asSortedCollection occurrencesOf:10
-"
-! !
-!SortedCollection methodsFor:'searching'!
-before:anObject
-"return the element before the argument, anObject; or nil if there is none.
-If the receiver does not contain anObject, report an error"
-^ self before:anObject ifAbsent:[self errorValueNotFound:anObject]
-"
-#(7 3 9 10 99) asSortedCollection before:50
-#(7 3 9 10 99) asSortedCollection before:1
-#(7 3 9 10 99) asSortedCollection before:1000
-#(7 3 9 10 99) asSortedCollection before:10
-#(7 3 9 10 99) asSortedCollection before:7
-#(7 3 9 10 99) asSortedCollection before:99
-#(7 10 3 10 9 10 10 99) asSortedCollection before:9
-#(7 10 3 10 9 10 10 99) asSortedCollection before:10
-"
-!
-before:anObject ifAbsent:exceptionBlock
-"return the element before the argument, anObject; or nil if there is none.
-If the receiver does not contain anObject, return the result from evaluating
-exceptionBlock."
-|index      "{ Class: SmallInteger }"|
-index := self indexForInserting:anObject.
-((index <= firstIndex)
-or:[(contentsArray at:index) ~= anObject]) ifTrue:[^ exceptionBlock value].
-^ contentsArray at:index - 1
-"
-#(7 3 9 10 99) asSortedCollection before:50
-#(7 3 9 10 99) asSortedCollection before:1
-#(7 3 9 10 99) asSortedCollection before:10
-#(7 3 9 10 99) asSortedCollection before:7
-#(7 3 9 10 99) asSortedCollection before:99
-#(7 10 3 10 9 10 10 99) asSortedCollection before:9
-#(7 10 3 10 9 10 10 99) asSortedCollection before:10
-"
-!
-after:anObject
-"return the element after the argument, anObject; or nil if there is none.
-If anObject is contained multiple times in the collection, return the
-the first element which is non-equal to anObject.
-If the receiver does not contain anObject, report an error"
-^ self after:anObject ifAbsent:[self errorValueNotFound:anObject]
-"
-#(7 3 9 10 99) asSortedCollection after:50
-#(7 3 9 10 99) asSortedCollection after:1
-#(7 3 9 10 99) asSortedCollection after:10
-#(7 3 9 10 99) asSortedCollection after:7
-#(7 3 9 10 99) asSortedCollection after:99
-#(7 10 3 10 9 10 10 99) asSortedCollection after:9
-#(7 10 3 10 9 10 10 99) asSortedCollection after:10
-"
-!
-after:anObject ifAbsent:exceptionBlock
-"return the element after the argument, anObject; or nil if there is none.
-If anObject is contained multiple times in the collection, return the
-the first element which is non-equal to anObject.
-If the receiver does not contain anObject, return the result from evaluating
-exceptionBlock."
-|index      "{ Class: SmallInteger }"|
-index := self indexForInserting:anObject.
-((index < firstIndex)
-or:[(contentsArray at:index) ~= anObject]) ifTrue:[^ exceptionBlock value].
-"skip multiple occurences of the same ..."
-[(index <= lastIndex) and:[(contentsArray at:index) = anObject]] whileTrue:[
-	index := index + 1
-].
-(index > lastIndex) ifTrue:[^ nil].
-^ contentsArray at:index
-! !
 !SortedCollection methodsFor:'instance protocol'!
 sortBlock
 "return the block used for sorting"
 #($f $G $z $Y $o $H) asSortedCollection sortBlock:[:a : b | a asUppercase < b asUppercase]
 "
 ! !
 !SortedCollection methodsFor:'private'!
-setSortBlock: aSortBlock
-"set the sortblock without resorting - private only"
-sortBlock := aSortBlock
-!
 indexForInserting:anObject
 "search the index at which to insert anObject. Can also be used
 to search for an existing element by checking if the element at
 the returned index is the one we look for.
 "
 #(1 2 3 4 7 99 1313 981989 898989898) asSortedCollection indexForInserting:50
 #(1.0 2.0 3 4 7 49.0 51.0 99 1313 981989 898989898) asSortedCollection indexForInserting:50
 "
-! !
+!
+setSortBlock: aSortBlock
+"set the sortblock without resorting - private only"
+sortBlock := aSortBlock
+! !
+!SortedCollection methodsFor:'searching'!
+after:anObject
+"return the element after the argument, anObject; or nil if there is none.
+If anObject is contained multiple times in the collection, return the
+the first element which is non-equal to anObject.
+If the receiver does not contain anObject, report an error"
+^ self after:anObject ifAbsent:[self errorValueNotFound:anObject]
+"
+#(7 3 9 10 99) asSortedCollection after:50
+#(7 3 9 10 99) asSortedCollection after:1
+#(7 3 9 10 99) asSortedCollection after:10
+#(7 3 9 10 99) asSortedCollection after:7
+#(7 3 9 10 99) asSortedCollection after:99
+#(7 10 3 10 9 10 10 99) asSortedCollection after:9
+#(7 10 3 10 9 10 10 99) asSortedCollection after:10
+"
+!
+after:anObject ifAbsent:exceptionBlock
+"return the element after the argument, anObject; or nil if there is none.
+If anObject is contained multiple times in the collection, return the
+the first element which is non-equal to anObject.
+If the receiver does not contain anObject, return the result from evaluating
+exceptionBlock."
+|index      "{ Class: SmallInteger }"|
+index := self indexForInserting:anObject.
+((index < firstIndex)
+or:[(contentsArray at:index) ~= anObject]) ifTrue:[^ exceptionBlock value].
+"skip multiple occurences of the same ..."
+[(index <= lastIndex) and:[(contentsArray at:index) = anObject]] whileTrue:[
+	index := index + 1
+].
+(index > lastIndex) ifTrue:[^ nil].
+^ contentsArray at:index
+!
+before:anObject
+"return the element before the argument, anObject; or nil if there is none.
+If the receiver does not contain anObject, report an error"
+^ self before:anObject ifAbsent:[self errorValueNotFound:anObject]
+"
+#(7 3 9 10 99) asSortedCollection before:50
+#(7 3 9 10 99) asSortedCollection before:1
+#(7 3 9 10 99) asSortedCollection before:1000
+#(7 3 9 10 99) asSortedCollection before:10
+#(7 3 9 10 99) asSortedCollection before:7
+#(7 3 9 10 99) asSortedCollection before:99
+#(7 10 3 10 9 10 10 99) asSortedCollection before:9
+#(7 10 3 10 9 10 10 99) asSortedCollection before:10
+"
+!
+before:anObject ifAbsent:exceptionBlock
+"return the element before the argument, anObject; or nil if there is none.
+If the receiver does not contain anObject, return the result from evaluating
+exceptionBlock."
+|index      "{ Class: SmallInteger }"|
+index := self indexForInserting:anObject.
+((index <= firstIndex)
+or:[(contentsArray at:index) ~= anObject]) ifTrue:[^ exceptionBlock value].
+^ contentsArray at:index - 1
+"
+#(7 3 9 10 99) asSortedCollection before:50
+#(7 3 9 10 99) asSortedCollection before:1
+#(7 3 9 10 99) asSortedCollection before:10
+#(7 3 9 10 99) asSortedCollection before:7
+#(7 3 9 10 99) asSortedCollection before:99
+#(7 10 3 10 9 10 10 99) asSortedCollection before:9
+#(7 10 3 10 9 10 10 99) asSortedCollection before:10
+"
+! !
+!SortedCollection methodsFor:'testing'!
+includes:anObject
+"return true, if the argument, anObject is in the collection.
+Redefined, since due to being sorted, the inclusion check can
+be done with log-n compares i.e. much faster."
+|index "{ Class: SmallInteger }"|
+index := self indexForInserting:anObject.
+((index < firstIndex) or:[index > lastIndex]) ifTrue:[^ false].
+^ (contentsArray at:index) = anObject
+"
+#(7 3 9 10 99) asSortedCollection includes:50
+#(7 3 9 10 99) asSortedCollection includes:10
+"
+!
+occurrencesOf:anObject
+"return how many times the argument, anObject is in the collection.
+Redefined, since due to being sorted, the range of checked objects
+can be limited i.e. it can be done much faster."
+|index      "{ Class: SmallInteger }"
+tally      "{ Class: SmallInteger }" |
+index := self indexForInserting:anObject.
+((index < firstIndex) or:[index > lastIndex]) ifTrue:[^ 0].
+tally := 0.
+[(index <= lastIndex) and:[(contentsArray at:index) = anObject]] whileTrue:[
+	tally := tally + 1.
+	index := index + 1
+].
+^ tally
+"
+#(7 3 9 10 99) asSortedCollection occurrencesOf:50
+#(7 3 9 10 99) asSortedCollection occurrencesOf:10
+#(7 10 3 10 9 10 10 99) asSortedCollection occurrencesOf:10
+"
+! !
+SortedCollection initialize!

changeset 607	a9a526c51233
parent 530	07d0bce293c9
child 629	2ceefe9b5a19