SortedCollection.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Sat, 23 Jan 2016 07:23:05 +0000
branchjv
changeset 19103 71257a47eba2
parent 18509 85976deb6616
parent 19075 3063ae9974c4
child 19137 199b5e15b1da
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     1
"
a27a279701f8 Initial revision
claus
parents:
diff changeset
     2
 COPYRIGHT (c) 1993 by Claus Gittinger
159
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
     3
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     4
a27a279701f8 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
"
5359
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
    12
"{ Package: 'stx:libbasic' }"
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
    13
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
    14
"{ NameSpace: Smalltalk }"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
    15
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    16
OrderedCollection subclass:#SortedCollection
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
    17
	instanceVariableNames:'sortBlock'
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
    18
	classVariableNames:'DefaultSortBlock'
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
    19
	poolDictionaries:''
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
    20
	category:'Collections-Sequenceable'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    21
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    22
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    23
!SortedCollection class methodsFor:'documentation'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    24
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    25
copyright
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    26
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    27
 COPYRIGHT (c) 1993 by Claus Gittinger
159
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
    28
	      All Rights Reserved
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    29
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    30
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    31
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    32
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    33
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    34
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    35
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    36
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    37
!
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    38
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    39
documentation
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    40
"
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    41
    I keep my elements sorted. The sort order is defined by a sortblock,
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
    42
    a two-argument block which, when given two elements of the collection,
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
    43
    should return true if the element given as first arg has to come before the
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    44
    element given as second arg.
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    45
1156
7ce47f220573 commentary
Claus Gittinger <cg@exept.de>
parents: 1155
diff changeset
    46
    Equal elements may occur multiple times.
7ce47f220573 commentary
Claus Gittinger <cg@exept.de>
parents: 1155
diff changeset
    47
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    48
    SortedCollection uses quickSort to resort and a binary search when adding/removing elements.
1156
7ce47f220573 commentary
Claus Gittinger <cg@exept.de>
parents: 1155
diff changeset
    49
    Because insertion/removal may require that remaining elements have to
7ce47f220573 commentary
Claus Gittinger <cg@exept.de>
parents: 1155
diff changeset
    50
    be shifted within the container, adding many individual elements may be done faster
7ce47f220573 commentary
Claus Gittinger <cg@exept.de>
parents: 1155
diff changeset
    51
    by creating a completely new collection from the unsorted elements.
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    52
    (see examples)
1156
7ce47f220573 commentary
Claus Gittinger <cg@exept.de>
parents: 1155
diff changeset
    53
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    54
    A sortBlock of [:a :b | a < b] defines ascending sort-order,
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    55
    while [:a :b | a > b] defines descening order.
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    56
    The default sortBlock for SortedCollections is the first one.
1290
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1175
diff changeset
    57
3251
87cac58a4e57 added VW compatibility warning
Claus Gittinger <cg@exept.de>
parents: 3250
diff changeset
    58
    Compatibility Warning:
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    59
        VW seems to use a default sortBlock which compares a<=b, wheras ST/X uses a<b.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    60
        That means, that elements which are compared MUST understand #< in ST/X
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    61
        while the minumum protocol is #<= in VW.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    62
        This may be changed in a future release of ST/X
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    63
        (it is not yet, to not confuse existing applications ...
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    64
         ... be aware, that the sortBlock has an effect on a few algorithms
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    65
         found here; especially #indexForInserting is critical.)
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
    66
14304
de0dd4c4c40a changed: #documentation
Claus Gittinger <cg@exept.de>
parents: 14116
diff changeset
    67
    [caveat:]
de0dd4c4c40a changed: #documentation
Claus Gittinger <cg@exept.de>
parents: 14116
diff changeset
    68
        a balanced tree may be a better choice, as inserting may be slow when
de0dd4c4c40a changed: #documentation
Claus Gittinger <cg@exept.de>
parents: 14116
diff changeset
    69
        elements have to be shifted.
3251
87cac58a4e57 added VW compatibility warning
Claus Gittinger <cg@exept.de>
parents: 3250
diff changeset
    70
1290
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1175
diff changeset
    71
    [author:]
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    72
        Claus Gittinger
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
    73
"
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    74
!
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    75
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    76
examples
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    77
"
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
    78
    when many elements are to be added, it may be better to add them
1175
7ca26065cf02 commentary
Claus Gittinger <cg@exept.de>
parents: 1173
diff changeset
    79
    all en-bloeque instead of individually.
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    80
    The reason is that for each individual #add:, the contents has to be
1175
7ca26065cf02 commentary
Claus Gittinger <cg@exept.de>
parents: 1173
diff changeset
    81
    shifted, to create an empty slot for the new element.
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    82
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    83
    timing example:
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    84
9074
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
    85
        |o rnd|
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    86
9074
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
    87
        o := SortedCollection new.
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
    88
        rnd := Random new.
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
    89
        10000 timesRepeat:[
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
    90
            o add:rnd next.
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
    91
        ]
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    92
1175
7ca26065cf02 commentary
Claus Gittinger <cg@exept.de>
parents: 1173
diff changeset
    93
    takes 1365 ms on a P5 (admitted: this is a fast machine ;-)
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    94
    Times are a'changing: 
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    95
        Just came around 2005: on my 1.5Ghz laptop, this now takes 260ms...
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
    96
        an another comment 2008: on a 1.8Ghz laptop, it takes now 105ms...
9074
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
    97
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    98
    In contrast:
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
    99
9074
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
   100
        |o rnd|
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
   101
9074
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
   102
        o := OrderedCollection new.
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
   103
        rnd := Random new.
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
   104
        10000 timesRepeat:[
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
   105
            o add:rnd next.
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
   106
        ].
8358ce743c48 comment
Claus Gittinger <cg@exept.de>
parents: 9073
diff changeset
   107
        o := o asSortedCollection
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
   108
1175
7ca26065cf02 commentary
Claus Gittinger <cg@exept.de>
parents: 1173
diff changeset
   109
    takes 383 ms on the same machine.
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   110
        2005: on my 1.5Ghz laptop, this now takes 100ms
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   111
        2008: on a 1.8Ghz laptop, this now takes 47ms
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   112
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   113
    If you already have a big sortedCollection at hand, adding multiple
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   114
    items may be better done with #addAll:, which resorts all elements, if
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   115
    the number of added items is more than some threshold number.
3251
87cac58a4e57 added VW compatibility warning
Claus Gittinger <cg@exept.de>
parents: 3250
diff changeset
   116
    However, the break-even point where bulk-adding is faster depends
87cac58a4e57 added VW compatibility warning
Claus Gittinger <cg@exept.de>
parents: 3250
diff changeset
   117
    on the machine ... (and ST/X version ;-).
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   118
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   119
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   120
  adding elements in order:
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   121
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   122
    |c|
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   123
    Time millisecondsToRun:[
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   124
        10 timesRepeat:[
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   125
            |c|
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   126
            c := SortedCollection new.
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   127
            (1 to:100000) do:[:e | c add:e].
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   128
        ]
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   129
    ].    
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   130
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   131
    (5.4.1: 2031 2187)
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   132
    (5.4.3: 484 516)
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   133
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   134
    |c|
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   135
    c := SortedCollection new.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   136
    (1 to:100000) do:[:e | c add:e].
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   137
    self assert:(c asBag = (1 to:100000) asBag).
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   138
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   139
  adding elements in reverse order:
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   140
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   141
    Time millisecondsToRun:[
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   142
        10 timesRepeat:[
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   143
            |c|
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   144
            c := SortedCollection new.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   145
            (1 to:100000) reverseDo:[:e | c add:e].
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   146
        ]
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   147
    ].        
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   148
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   149
    (5.4.1: 201969)
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   150
    (5.4.3: 1609 1766)
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   151
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   152
    |c|
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   153
    c := SortedCollection new.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   154
    (1 to:100000) reverseDo:[:e | c add:e].
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   155
    self assert:(c asBag = (1 to:100000) asBag).
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   156
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   157
  adding elements in random order:
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   158
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   159
    |toAdd|
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   160
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   161
    toAdd := (1 to:100000) asOrderedCollection randomShuffle.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   162
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   163
    Time millisecondsToRun:[
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   164
        10 timesRepeat:[
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   165
            |c|
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   166
            c := SortedCollection new.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   167
            toAdd do:[:e | c add:e].
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   168
        ]
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   169
    ].
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   170
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   171
    (5.4.1: 108484)
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   172
    (5.4.3: 75734)
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   173
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   174
    |c|
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   175
    c := SortedCollection new.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   176
    (1 to:100000) asOrderedCollection randomShuffle do:[:e | c add:e].
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   177
    self assert:(c asBag = (1 to:100000) asBag).
1167
a24366edb65e commentary
Claus Gittinger <cg@exept.de>
parents: 1162
diff changeset
   178
"
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
   179
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   180
a27a279701f8 Initial revision
claus
parents:
diff changeset
   181
!SortedCollection class methodsFor:'initialization'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   182
a27a279701f8 Initial revision
claus
parents:
diff changeset
   183
initialize
8180
7c346c8015f2 Only use #> for comparisons, since this is the base mechanism.
Stefan Vogel <sv@exept.de>
parents: 7554
diff changeset
   184
    "setup the default sortBlock.
12034
0d6c9626eb0a comment
Claus Gittinger <cg@exept.de>
parents: 11478
diff changeset
   185
     Use #<, since this is the base method in Magnitude."
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   186
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   187
    "/ only do this once at early startup
913
7d9881f9c908 only initialize once
Claus Gittinger <cg@exept.de>
parents: 629
diff changeset
   188
    DefaultSortBlock isNil ifTrue:[
12034
0d6c9626eb0a comment
Claus Gittinger <cg@exept.de>
parents: 11478
diff changeset
   189
        DefaultSortBlock := [:a :b | a < b]
913
7d9881f9c908 only initialize once
Claus Gittinger <cg@exept.de>
parents: 629
diff changeset
   190
    ]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   191
913
7d9881f9c908 only initialize once
Claus Gittinger <cg@exept.de>
parents: 629
diff changeset
   192
    "
7d9881f9c908 only initialize once
Claus Gittinger <cg@exept.de>
parents: 629
diff changeset
   193
     SortedCollection initialize
7d9881f9c908 only initialize once
Claus Gittinger <cg@exept.de>
parents: 629
diff changeset
   194
    "
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   195
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   196
    "Modified: 12.4.1996 / 12:29:27 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   197
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   198
a27a279701f8 Initial revision
claus
parents:
diff changeset
   199
!SortedCollection class methodsFor:'instance creation'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   200
2929
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   201
forStrings
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   202
    "this is supposed to return a sortedCollection, which sorts using
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   203
     the current locales collating sequence. For now, simply use a
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   204
     normal string compare.
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   205
     This will change"
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   206
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   207
    ^ self new
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   208
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   209
    "Modified: 13.9.1997 / 10:18:58 / cg"
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   210
    "Created: 13.9.1997 / 10:41:54 / cg"
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   211
!
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   212
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   213
forStrings:size
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   214
    "this is supposed to return a sortedCollection, which sorts using
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   215
     the current locales collating sequence. For now, simply use a
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   216
     normal string compare.
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   217
     This will change"
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   218
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   219
    ^ self new:size
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   220
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   221
    "Modified: 13.9.1997 / 10:18:58 / cg"
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   222
!
ca74fdc386cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2248
diff changeset
   223
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   224
new
2
claus
parents: 1
diff changeset
   225
    "return a new sortedCollection, the sorting is done using
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   226
     a compare for a < b, in ascending order"
2
claus
parents: 1
diff changeset
   227
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   228
    ^ super new setSortBlock:DefaultSortBlock
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   229
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   230
    "Modified: 12.4.1996 / 12:28:18 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   231
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   232
a27a279701f8 Initial revision
claus
parents:
diff changeset
   233
new:size
2
claus
parents: 1
diff changeset
   234
    "return a new sortedCollection with preallocated size.
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   235
     The sorting is done using a compare for a < b, in ascending order"
2
claus
parents: 1
diff changeset
   236
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   237
    ^ (super new:size) setSortBlock:DefaultSortBlock
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   238
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   239
    "Modified: 12.4.1996 / 12:28:22 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   240
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   241
a27a279701f8 Initial revision
claus
parents:
diff changeset
   242
sortBlock:aBlock
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   243
    "return a new sortedCollection, whe the sort order is defined
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   244
     by aBlock.
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   245
     This must be a two-argument block which returns true if its arg1 has to come before
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   246
     its arg2 in the collection."
2
claus
parents: 1
diff changeset
   247
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   248
    ^ super new setSortBlock:aBlock
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   249
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   250
    "default:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   251
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   252
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   253
     s := SortedCollection new.
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   254
     s add:15; add:99; add:3; add:-29; add:17; add:-6.
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   255
     Transcript showCR:s
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   256
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   257
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   258
    "sorting by absolute values:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   259
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   260
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   261
     s := SortedCollection sortBlock:[:a :b | a abs < b abs].
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   262
     s add:15; add:99; add:3; add:29; add:17; add:-6.
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   263
     Transcript showCR:s
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   264
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   265
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   266
    "default again:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   267
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   268
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   269
     s := SortedCollection new.
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   270
     s add:'foo'; add:'Bar'; add:'baz'; add:'hello'; add:'world'; add:'Wow'.
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   271
     Transcript showCR:s
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   272
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   273
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   274
    "sorting strings caseless:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   275
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   276
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   277
     s := SortedCollection sortBlock:[:a :b | a asLowercase < b asLowercase].
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   278
     s add:'foo'; add:'Bar'; add:'baz'; add:'hello'; add:'world'; add:'Wow'.
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   279
     Transcript showCR:s
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   280
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   281
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   282
    "Modified: 12.4.1996 / 12:26:28 / cg"
329
claus
parents: 216
diff changeset
   283
!
claus
parents: 216
diff changeset
   284
claus
parents: 216
diff changeset
   285
withAll:aCollection sortBlock:aBlock
claus
parents: 216
diff changeset
   286
    "initialize from aCollection and set the sort-block"
claus
parents: 216
diff changeset
   287
2248
b11a16f51048 withAll:aCollection sortBlock:aBlock
ca
parents: 1422
diff changeset
   288
    ^ (self sortBlock:aBlock) addAll:aCollection; yourself
329
claus
parents: 216
diff changeset
   289
claus
parents: 216
diff changeset
   290
    "
claus
parents: 216
diff changeset
   291
     SortedCollection withAll:#(1 2 3 4 5 6 7 8 9 0)
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   292
		      sortBlock:[:a :b | a > b]
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   293
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   294
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   295
    "default:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   296
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   297
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   298
     s := SortedCollection withAll:#(15 99 3 29 17 -6).
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   299
     Transcript showCR:s
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   300
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   301
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   302
    "sorting by absolute values:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   303
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   304
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   305
     s := SortedCollection withAll:#(15 99 3 29 17 -6) sortBlock:[:a :b | a abs < b abs].
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   306
     Transcript showCR:s
329
claus
parents: 216
diff changeset
   307
    "
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   308
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   309
    "default again:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   310
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   311
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   312
     s := SortedCollection withAll:#('foo' 'Bar' 'baz' 'hello' 'world' 'Wow').
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   313
     Transcript showCR:s
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   314
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   315
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   316
    "sorting strings caseless:
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   317
     |s|
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   318
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   319
     s := SortedCollection withAll:#('foo' 'Bar' 'baz' 'hello' 'world' 'Wow') sortBlock:[:a :b | a asLowercase < b asLowercase].
1422
9a0b792f2953 showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   320
     Transcript showCR:s
1155
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   321
    "
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   322
4f5fe0bdfe54 commentary
Claus Gittinger <cg@exept.de>
parents: 913
diff changeset
   323
    "Modified: 12.4.1996 / 12:28:09 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   324
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   325
7300
461bb09c5954 category
Claus Gittinger <cg@exept.de>
parents: 6737
diff changeset
   326
!SortedCollection class methodsFor:'Compatibility-Dolphin'!
6411
199e6d88c562 dolphin compatibility
Claus Gittinger <cg@exept.de>
parents: 5816
diff changeset
   327
199e6d88c562 dolphin compatibility
Claus Gittinger <cg@exept.de>
parents: 5816
diff changeset
   328
sortBlock:aBlock withAll:aCollection
199e6d88c562 dolphin compatibility
Claus Gittinger <cg@exept.de>
parents: 5816
diff changeset
   329
    ^ self withAll:aCollection sortBlock:aBlock
199e6d88c562 dolphin compatibility
Claus Gittinger <cg@exept.de>
parents: 5816
diff changeset
   330
! !
199e6d88c562 dolphin compatibility
Claus Gittinger <cg@exept.de>
parents: 5816
diff changeset
   331
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   332
!SortedCollection methodsFor:'adding & removing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   333
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   334
add:anObject
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   335
    "add the argument, anObject at the proper place in the receiver. 
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   336
     Returns the argument, anObject (sigh)."
2
claus
parents: 1
diff changeset
   337
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   338
    |index lastElement|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   339
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   340
    "/
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   341
    "/ cg: the original code was simply:
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   342
    "/
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   343
    "/  index := self indexForInserting:anObject.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   344
    "/  index := self makeRoomAtIndex:index.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   345
    "/  contentsArray basicAt:index put:anObject.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   346
    "/
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   347
    "/  which was nice and simple to understand.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   348
    "/ However, the code below is 5 times faster, if elements are added in an already ordered fashion,
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   349
    "/ which often happens.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   350
    "/ so we allow the code to be a bit more complicated...
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   351
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   352
    (lastIndex < firstIndex "i.e. self size == 0"
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   353
    or:[ 
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   354
        lastElement := contentsArray basicAt:lastIndex.
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   355
        (sortBlock value:lastElement value:anObject)    
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   356
    ]) ifTrue:[
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   357
        "/ empty or lastElement is smaller then newElement; add at the end
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   358
        index := lastIndex.
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   359
        (index == contentsArray size) ifTrue:[
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   360
            self makeRoomAtLast.
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   361
            index := lastIndex.
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   362
        ].
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   363
        lastIndex := index := index + 1.
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   364
    ] ifFalse:[
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   365
        index := self indexForInserting:anObject.
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   366
        (index == firstIndex) ifTrue:[
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   367
            (firstIndex == 1) ifTrue:[
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   368
                self makeRoomAtFront.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   369
            ].
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   370
            index := firstIndex := firstIndex - 1.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   371
        ] ifFalse:[
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   372
            index := self makeRoomAtIndex:index.
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   373
        ].
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   374
    ].
3340
300d88cf8b14 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3251
diff changeset
   375
    contentsArray basicAt:index put:anObject.
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   376
    ^ anObject
2
claus
parents: 1
diff changeset
   377
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   378
    "
11268
7ce883e9a42e tuned add: if the elements are added in sorted order
Claus Gittinger <cg@exept.de>
parents: 9920
diff changeset
   379
     #(7 3 9 10 99) asSortedCollection add:5; yourself
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   380
     #(7 3 9 10 99) asSortedCollection add:1; yourself
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   381
     #(7 3 9 10 99) asSortedCollection add:1000; yourself
11274
a6f648b1d291 tune adding in order / in reverse order
Claus Gittinger <cg@exept.de>
parents: 11268
diff changeset
   382
     #(7 3 9 10 99) asSortedCollection add:1; yourself   
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   383
    "
1162
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
   384
11276
1d4450f49a14 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11274
diff changeset
   385
    "Modified: / 22-10-2008 / 17:09:39 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   386
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   387
a27a279701f8 Initial revision
claus
parents:
diff changeset
   388
addAll:aCollection
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   389
    "add all elements of the argument, aCollection to the receiver.
5028
1f7e943ce46e use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 4596
diff changeset
   390
     Returns the argument, aCollection (sigh)."
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   391
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   392
    |addedCollection mySize numAdded|
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   393
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   394
    numAdded := aCollection size.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   395
    mySize := self size.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   396
5359
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   397
    (aCollection isSortedCollection
7554
7ea961a68e34 Save copying in #addAll
Stefan Vogel <sv@exept.de>
parents: 7300
diff changeset
   398
     and:[aCollection sortBlock == sortBlock]) ifTrue:[
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   399
        addedCollection := aCollection.
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   400
    ] ifFalse:[
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   401
        addedCollection := Array withAll:aCollection.
14101
8c41a875b2cf changed: #addAll:
Stefan Vogel <sv@exept.de>
parents: 12038
diff changeset
   402
        addedCollection stableSort:sortBlock.
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   403
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   404
        mySize == 0 ifTrue:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   405
            "/ special case: I am empty - add them en-bloque.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   406
            contentsArray := addedCollection.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   407
            firstIndex := 1.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   408
            lastIndex := numAdded.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   409
            ^ aCollection
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   410
        ].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   411
    ].
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   412
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   413
    "/
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   414
    "/ do a mergeSort with the sortedContents
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   415
    "/
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   416
    self mergeSorted:addedCollection.
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   417
    ^ aCollection
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   418
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
   419
    "
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   420
     #(7 3 9 10 99) asSortedCollection addAll:#(77 0 1 16 5); yourself
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   421
5028
1f7e943ce46e use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 4596
diff changeset
   422
     ( #(7 3 9 10 99) asSortedCollection:[:a :b | a > b])
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   423
         addAll:#(77 0 1 16 5); yourself
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   424
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   425
     #(7 3 9 10 99) asSortedCollection
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   426
        addAll:( #(77 0 1 16 5) asSortedCollection:[:a :b | a > b]); yourself
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   427
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   428
     (#(7 3 9 10 99) asSortedCollection:[:a :b | a > b])
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   429
        addAll:( #(77 0 1 16 5) asSortedCollection:[:a :b | a < b]); yourself
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   430
    "
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   431
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   432
    "
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   433
     |x e|
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   434
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   435
     e := (1 to:100) asSortedCollection.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   436
     TimeDuration toRun:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   437
         10000 timesRepeat:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   438
            x := SortedCollection new:100.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   439
            x addAll:e. 
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   440
         ].
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   441
     ].      
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
   442
    "
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   443
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   444
    "Modified: 13.4.1996 / 12:42:15 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   445
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   446
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   447
mergeSorted:aSortedCollection
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   448
    "add all elements of the argument, aSortedCollection to the receiver.
12038
1e214cdac722 comment/format in:
Claus Gittinger <cg@exept.de>
parents: 12034
diff changeset
   449
     This leads to an error, if the argument is not sorted.
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   450
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   451
     This should be used when a number of elements is to be added.
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   452
     Notice, that quicksort degenerates to a veeery slow bubble-like
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   453
     sort when a collection of already sorted elements is given to it.
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   454
     Therefore, adding chunks is better done by sorting the chunk and merging
14310
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   455
     it in, instead of resorting the receiver.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   456
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   457
     aSortedCollection must be sorted by the same sortBlock as myself!!"
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   458
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   459
    |newContentsArray
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   460
     contentsArray2
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   461
     destIndex "{ Class: SmallInteger }"
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   462
     n1        "{ Class: SmallInteger }"
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   463
     n2        "{ Class: SmallInteger }"
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   464
     srcIndex1 "{ Class: SmallInteger }"
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   465
     srcIndex2 "{ Class: SmallInteger }"
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   466
     last1     "{ Class: SmallInteger }"
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   467
     last2     "{ Class: SmallInteger }"
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   468
     end1Reached end2Reached
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   469
     el1 el2 |
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   470
14310
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   471
    n2 := aSortedCollection size.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   472
    n2 == 0 ifTrue:[
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   473
        ^ self.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   474
    ].
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   475
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   476
    aSortedCollection isSortedCollection ifTrue:[
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   477
        contentsArray2 := aSortedCollection contentsArray.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   478
        srcIndex2 := aSortedCollection firstIndex.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   479
    ] ifFalse:[
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   480
        contentsArray2 := aSortedCollection.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   481
        srcIndex2 := 1.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   482
    ].
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   483
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   484
    n1 := self size.
5381
914e310a69be Fix #mergeSorted if one of the collections is empty.
Stefan Vogel <sv@exept.de>
parents: 5359
diff changeset
   485
    n1 == 0 ifTrue:[
14310
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   486
        firstIndex := srcIndex2.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   487
        lastIndex := firstIndex + n2 - 1.
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   488
        contentsArray := contentsArray2 copy.
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   489
        ^ self.
5381
914e310a69be Fix #mergeSorted if one of the collections is empty.
Stefan Vogel <sv@exept.de>
parents: 5359
diff changeset
   490
    ].
914e310a69be Fix #mergeSorted if one of the collections is empty.
Stefan Vogel <sv@exept.de>
parents: 5359
diff changeset
   491
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   492
    newContentsArray := Array new:(n1 + n2).
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   493
    destIndex := 1.
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   494
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   495
    last2 := srcIndex2 + n2 -1.
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   496
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   497
    srcIndex1 := firstIndex.
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   498
    last1 := srcIndex1 + n1 -1.
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   499
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   500
    (srcIndex1 <= last1 and:[srcIndex2 <= last2]) ifTrue:[
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   501
        el1 := contentsArray basicAt:srcIndex1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   502
        el2 := contentsArray2 basicAt:srcIndex2.
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   503
        end1Reached := end2Reached := false.
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   504
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   505
        [end1Reached or:[end2Reached]] whileFalse:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   506
            (sortBlock value:el1 value:el2) ifTrue:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   507
                "/ el1 to come before el2
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   508
                newContentsArray basicAt:destIndex put:el1. destIndex := destIndex + 1.
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   509
                srcIndex1 := srcIndex1 + 1.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   510
                srcIndex1 <= last1 ifTrue:[
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   511
                    el1 := contentsArray basicAt:srcIndex1.
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   512
                ] ifFalse:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   513
                    end1Reached := true
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   514
                ]
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   515
            ] ifFalse:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   516
                "/ el2 to come before el1
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   517
                newContentsArray basicAt:destIndex put:el2. destIndex := destIndex + 1.
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   518
                srcIndex2 := srcIndex2 + 1.
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   519
                srcIndex2 <= last2 ifTrue:[
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   520
                    el2 := contentsArray2 basicAt:srcIndex2.
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   521
                ] ifFalse:[
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   522
                    end2Reached := true
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   523
                ]
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   524
            ]
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   525
        ]
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   526
    ].
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   527
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   528
    "/ fill up with remaining elements from source1
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   529
    (srcIndex1 <= last1) ifTrue:[
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   530
        newContentsArray
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   531
            replaceFrom:destIndex
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   532
            to:(destIndex+(last1-srcIndex1))
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   533
            with:contentsArray
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   534
            startingAt:srcIndex1
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   535
    ].
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   536
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   537
    "/ fill up with remaining elements from source2
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   538
    (srcIndex2 <= last2) ifTrue:[
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   539
        newContentsArray
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   540
            replaceFrom:destIndex
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   541
            to:(destIndex+(last2-srcIndex2))
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   542
            with:contentsArray2
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   543
            startingAt:srcIndex2
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   544
    ].
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   545
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   546
    firstIndex := 1.
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   547
    lastIndex := n1 + n2.
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   548
    contentsArray := newContentsArray
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   549
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   550
    "
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   551
     #(7 3 9 10 99) asSortedCollection
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   552
        mergeSorted:#(77 0 1 16 5) asSortedCollection
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   553
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   554
     #(7 3 9 10 99) asSortedCollection
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   555
        mergeSorted:#(77 0 3 1 98 99 16 5) asSortedCollection
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   556
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   557
     #() asSortedCollection
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   558
        mergeSorted:#(77 0 3 1 98 99 16 5) asSortedCollection
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   559
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   560
     #(7 3 9 10 99) asSortedCollection
11286
76f3020ba113 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11276
diff changeset
   561
        mergeSorted:#() asSortedCollection
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   562
    "
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   563
3250
c4b444774f1c oops - mergesort cannot simply copy remaining
Claus Gittinger <cg@exept.de>
parents: 2929
diff changeset
   564
    "Modified: / 30.1.1998 / 01:49:42 / cg"
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   565
! !
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   566
5560
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   567
!SortedCollection methodsFor:'blocked'!
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   568
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   569
add:newObject after:oldObject
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   570
    "catch this - its not allowed for sortedCollections"
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   571
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   572
    self shouldNotImplement
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   573
!
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   574
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   575
add:newObject before:oldObject
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   576
    "catch this - its not allowed for sortedCollections"
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   577
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   578
    self shouldNotImplement
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   579
!
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   580
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   581
addFirst:anObject
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   582
    "catch this - its not allowed for sortedCollections"
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   583
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   584
    self shouldNotImplement
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   585
!
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   586
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   587
addLast:anObject
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   588
    "catch this - its not allowed for sortedCollections"
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   589
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   590
    self shouldNotImplement
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   591
! !
89a83b354d27 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 5381
diff changeset
   592
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   593
!SortedCollection methodsFor:'converting'!
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   594
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   595
asSortedCollection
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   596
    "return the receiver as a sorted collection"
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   597
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   598
    "could be an instance of a subclass..."
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   599
    self class == SortedCollection ifTrue:[
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   600
	sortBlock == DefaultSortBlock ifTrue:[
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   601
	    ^ self
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   602
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   603
    ].
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   604
    ^ super asSortedCollection
5029
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   605
!
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   606
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   607
asSortedCollection:aSortBlock
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   608
    "return the receiver as a sorted collection, using aSortBlock.
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   609
     Return the receiver, if its a sortedCollection and the sortBlock
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   610
     is the same as the argument-sortBlock"
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   611
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   612
    "could be an instance of a subclass..."
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   613
    self class == SortedCollection ifTrue:[
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   614
	"/ if the sortBlock is the same, return the receiver
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   615
	aSortBlock == sortBlock ifTrue:[
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   616
	    ^ self
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   617
	].
5029
ae3312dda1dd avoid creation of a new sortedCollection in #asSortedCollection:
Claus Gittinger <cg@exept.de>
parents: 5028
diff changeset
   618
    ].
5030
655a0f0a60c3 use my sortBlock when merge-sorting
Claus Gittinger <cg@exept.de>
parents: 5029
diff changeset
   619
    ^ super asSortedCollection:aSortBlock
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   620
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   621
95
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   622
!SortedCollection methodsFor:'copying'!
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   623
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   624
copyEmpty:size
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   625
    "return a copy of the receiver with no elements, but
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   626
     the same size. This method has been be redefined to
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   627
     preserve the sortBlock."
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   628
14110
86f18b7f3b54 changed: #copyEmpty:
Stefan Vogel <sv@exept.de>
parents: 14101
diff changeset
   629
    ^ (super copyEmpty:size) sortBlock:sortBlock
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   630
!
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   631
159
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
   632
postCopyFrom:anOriginal
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
   633
    "sent after a copy or when a new collection species has been created.
95
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   634
     The new collection should have the same sortBlock as the original."
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   635
159
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
   636
    sortBlock := anOriginal sortBlock
95
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   637
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   638
    "
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   639
     #(4 7 1 99 -1 17) asSortedCollection inspect
159
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
   640
     #(4 7 1 99 -1 17) asSortedCollection copy inspect
95
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   641
     (#(4 7 1 99 -1 17) asSortedCollection sortBlock:[:a :b | a > b]) inspect
159
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
   642
     (#(4 7 1 99 -1 17) asSortedCollection sortBlock:[:a :b | a > b]) copy inspect
514c749165c3 *** empty log message ***
claus
parents: 95
diff changeset
   643
     (#(4 7 1 99 -1 17) asSortedCollection select:[:e| e even]) inspect
95
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   644
    "
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   645
! !
d22739a0c6e9 *** empty log message ***
claus
parents: 88
diff changeset
   646
216
a8abff749575 *** empty log message ***
claus
parents: 202
diff changeset
   647
!SortedCollection methodsFor:'enumerating'!
184
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   648
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   649
collect:aBlock
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   650
    "evaluate the argument, aBlock for every element in the collection
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   651
     and return a collection of the results. Redefined to return an OrderedCollection;
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   652
     see X3J20 spec. (SortedCollection>>collect: should return an OrderedCollection)"
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   653
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   654
    |newCollection
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   655
     start  "{ Class:SmallInteger }"
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   656
     stop   "{ Class:SmallInteger }" |
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   657
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   658
    newCollection := self speciesForCollecting new:(self size).
184
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   659
    stop := lastIndex.
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   660
    start := firstIndex.
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   661
    start to:stop do:[:index |
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   662
        newCollection add:(aBlock value:(contentsArray basicAt:index)).
184
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   663
    ].
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   664
    ^ newCollection
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   665
! !
d795f0b1934a collect: fixed
claus
parents: 159
diff changeset
   666
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   667
!SortedCollection methodsFor:'instance protocol'!
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   668
5668
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   669
sort:aSortBlock
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   670
    "redefined from superclass to change the sortBlock"
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   671
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   672
    sortBlock ~~ aSortBlock ifTrue:[
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   673
	self sortBlock:aSortBlock.
5668
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   674
    ].
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   675
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   676
!
0cbaa16dc17c Inherited #sort: shows a debugger.
Stefan Vogel <sv@exept.de>
parents: 5604
diff changeset
   677
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   678
sortBlock
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   679
    "return the block used for sorting"
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   680
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   681
    ^ sortBlock
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   682
!
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   683
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   684
sortBlock:aSortBlock
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   685
    "change the sort criteria for a sorted collection, resort the elements of
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   686
    the collection, and return the receiver. The argument, aSortBlock must
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   687
    be a two-argument block which returns true if its arg1 has to come before
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   688
    its arg2 in the collection."
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   689
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   690
    sortBlock := aSortBlock.
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   691
    lastIndex > firstIndex ifTrue:[
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   692
	contentsArray quickSortFrom:firstIndex to:lastIndex sortBlock:aSortBlock
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   693
    ]
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   694
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   695
    "
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   696
     #(9 8 7 6 5 4 3) asSortedCollection
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   697
     #(9 8 7 6 5 4 3) asSortedCollection sortBlock:[:a : b | a < b]
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   698
     #(9 8 7 6 5 4 3) asSortedCollection sortBlock:[:a : b | a > b]
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   699
     #($f $G $z $Y $o $H) asSortedCollection
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   700
     #($f $G $z $Y $o $H) asSortedCollection sortBlock:[:a : b | a asUppercase < b asUppercase]
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   701
    "
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   702
! !
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   703
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   704
!SortedCollection methodsFor:'private'!
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   705
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   706
indexForInserting:anObject
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   707
    "search the index at which to insert anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   708
     Can also be used to search for an existing element
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   709
     by checking if the element at the returned index is the one we look for.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   710
     Uses a binarySearch since we can depend on the elements being in sorted order.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   711
     The returned index is a physical one, for accessing contentsArray."
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   712
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   713
    |low    "{ Class: SmallInteger}"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   714
     high   "{ Class: SmallInteger}"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   715
     middle "{ Class: SmallInteger}"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   716
     element|
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   717
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   718
    "
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   719
     we can of course use a binary search - since the elements are sorted
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   720
    "
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   721
    low := firstIndex.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   722
    high := lastIndex.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   723
    [low > high] whileFalse:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   724
        middle := (low + high) // 2.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   725
        element := contentsArray basicAt:middle.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   726
        (sortBlock value:element value:anObject) ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   727
            "middleelement is smaller than object"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   728
            low := middle + 1
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   729
        ] ifFalse:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   730
            high := middle - 1
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   731
        ]
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   732
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   733
    ^ low
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   734
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   735
    "
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   736
     #(1 2 3 4 7 99 1313 981989 898989898) asSortedCollection indexForInserting:50
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   737
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   738
     #(1.0 2.0 3 4 7 49.0 51.0 99 1313 981989 898989898) asSortedCollection indexForInserting:50
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   739
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   740
    "
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   741
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   742
    "Modified: 12.4.1996 / 13:22:03 / cg"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   743
!
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   744
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   745
setSortBlock: aSortBlock
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   746
    "set the sortblock without resorting - private only"
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   747
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   748
    sortBlock := aSortBlock
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   749
! !
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   750
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   751
!SortedCollection methodsFor:'queries'!
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   752
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   753
isSorted
5359
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   754
    "return true. if my elements are sorted"
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   755
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   756
    ^ true
5359
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   757
!
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   758
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   759
isSortedBy:aBlock
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   760
    "return true, if my elements are sorted (already) by the given criterion (sortBlock)."
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   761
5359
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   762
    aBlock == sortBlock ifTrue:[^ true].
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   763
    ^ super isSortedBy:aBlock
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   764
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   765
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   766
!
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   767
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   768
isSortedCollection
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   769
    "return true. if I am a sorted collection"
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   770
396b77b6f1d2 added #isSortedCollection, #isSortedBy:
Claus Gittinger <cg@exept.de>
parents: 5048
diff changeset
   771
    ^ true
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   772
!
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   773
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   774
speciesForCollecting
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   775
    "Redefined to return an OrderedCollection;
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   776
     see X3J20 spec. (SortedCollection>>collect: should return an OrderedCollection)"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   777
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   778
    ^ OrderedCollection
1173
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   779
! !
1d831f2c0d44 added #mergeSorted; changed #addAll: to make use of it
Claus Gittinger <cg@exept.de>
parents: 1167
diff changeset
   780
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   781
!SortedCollection methodsFor:'searching'!
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   782
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   783
after:anObject ifAbsent:exceptionBlock
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   784
    "return the element after the argument, anObject; or nil if there is none.
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   785
     If anObject is contained multiple times in the collection, return the
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   786
     the first element which is non-equal to anObject.
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   787
     If the receiver does not contain anObject, return the result from evaluating
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   788
     exceptionBlock."
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   789
1162
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
   790
    |index      "{ Class: SmallInteger }"
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
   791
     last       "{ Class: SmallInteger }"|
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   792
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   793
    index := self indexOf:anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   794
    index == 0 ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   795
        ^ exceptionBlock value.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   796
    ].
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   797
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   798
    "skip multiple occurrences of the same ..."
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   799
    index := index + firstIndex - 1.
1162
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
   800
    last := lastIndex.
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   801
    [(index <= last) and:[(contentsArray basicAt:index) = anObject]] whileTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   802
        index := index + 1
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   803
    ].
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   804
    (index > last) ifTrue:[^ exceptionBlock value].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   805
    ^ contentsArray basicAt:index
1162
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
   806
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   807
    "
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   808
     #(7 3 9 10 99) asSortedCollection after:50
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   809
     #(7 3 9 10 99) asSortedCollection after:3
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   810
     #(7 3 9 10 99) asSortedCollection after:1
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   811
     #(7 3 9 10 99) asSortedCollection after:10
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   812
     #(7 3 9 10 99) asSortedCollection after:7
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   813
     #(7 3 9 10 99) asSortedCollection after:99
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   814
     #(7 10 3 10 9 10 10 99) asSortedCollection after:9
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   815
     #(7 10 3 10 9 10 10 99) asSortedCollection after:10
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   816
    "
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   817
!
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   818
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   819
before:anObject ifAbsent:exceptionBlock
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   820
    "return the element before the argument, anObject; or nil if there is none.
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   821
     If the receiver does not contain anObject, return the result from evaluating
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   822
     exceptionBlock."
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   823
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   824
    |index      "{ Class: SmallInteger }"|
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   825
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   826
    index := self indexOf:anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   827
    index <= 1 ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   828
        ^ exceptionBlock value.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   829
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   830
    ^ contentsArray basicAt:firstIndex + index - 2
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   831
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   832
    "
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   833
     #(7 3 9 10 99) asSortedCollection before:50
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   834
     #(7 3 9 10 99) asSortedCollection before:3
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   835
     #(7 3 9 10 99) asSortedCollection before:1
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   836
     #(7 3 9 10 99) asSortedCollection before:10
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   837
     #(7 3 9 10 99) asSortedCollection before:7
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   838
     #(7 3 9 10 99) asSortedCollection before:99
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   839
     #(7 10 3 10 9 10 10 99) asSortedCollection before:9
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   840
     #(7 10 3 10 9 10 10 99) asSortedCollection before:10
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   841
    "
4596
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   842
!
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   843
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   844
indexOf:anObject
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   845
    "return true, if the argument, anObject is in the collection.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   846
     Redefined, since due to being sorted, the inclusion check can
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   847
     be done with log-n compares i.e. much faster."
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   848
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   849
    |index "{ Class: SmallInteger }"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   850
     initialIndex "{ Class: SmallInteger }"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   851
     element|
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   852
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   853
    "/ if I am small, the inherited linear search is faster ...
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   854
    (lastIndex - firstIndex) < 20 ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   855
        firstIndex > lastIndex ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   856
            "/ empty
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   857
            ^ 0
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   858
        ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   859
        ^ super indexOf:anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   860
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   861
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   862
    initialIndex := self indexForInserting:anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   863
    initialIndex > lastIndex ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   864
        initialIndex := lastIndex
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   865
    ] ifFalse:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   866
        initialIndex < firstIndex ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   867
            initialIndex := firstIndex
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   868
        ]
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   869
    ].
14310
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   870
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   871
    "the complex case: the collection may include elements, which are odered only by
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   872
     a single component (e.g. Associations by key). So we have to test all
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   873
     previous and next elements having the same component"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   874
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   875
    "for previous elements: while element is not smaller and not larger than anObject ... compare"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   876
    index := initialIndex.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   877
    [index >= firstIndex 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   878
     and:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   879
        element := contentsArray basicAt:index. 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   880
        ((sortBlock value:element value:anObject) or:[sortBlock value:anObject value:element]) not]
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   881
    ] whileTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   882
        element = anObject ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   883
            ^ index - firstIndex + 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   884
        ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   885
        index := index - 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   886
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   887
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   888
    "for next elements: while element is not smaller and not larger than anObject ... compare"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   889
    index := initialIndex.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   890
    [index <= lastIndex 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   891
     and:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   892
        element := contentsArray basicAt:index. 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   893
        ((sortBlock value:element value:anObject) or:[sortBlock value:anObject value:element]) not]
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   894
    ] whileTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   895
        element = anObject ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   896
            ^ index - firstIndex + 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   897
        ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   898
        index := index + 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   899
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   900
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   901
    ^ 0.
14310
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   902
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   903
    "
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   904
     #(7 3 9 10 99) asSortedCollection indexOf:50
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   905
     #(7 3 9 10 99) asSortedCollection indexOf:10
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   906
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   907
     #('aa' 'bb' 'cc' 'dd') asSortedCollection indexOf:'bb'
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   908
     #('aa' 'bb' 'cc' 'dd' 'aa' 'bb' 'cc' 'dd') asSortedCollection indexOf:'bb'
14310
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   909
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   910
     |allSyms indices|
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   911
     allSyms := Symbol allInstances asSortedCollection.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   912
     Time millisecondsToRun:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   913
         indices := allSyms collect:[:el | allSyms indexOf:el].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   914
     ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   915
     indices = (1 to:allSyms size)
14310
b1787ec39fd8 changed: #mergeSorted:
Stefan Vogel <sv@exept.de>
parents: 14309
diff changeset
   916
    "
4596
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   917
!
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   918
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   919
indexOf:anElement ifAbsent:exceptionBlock
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   920
    "Return the index of anElement within the receiver.
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
   921
     If the receiver does not contain anElement,
4596
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   922
     return the result of evaluating the argument, exceptionBlock."
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   923
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   924
    |idx|
4596
66a082fbc5b3 tuned indexOf
Claus Gittinger <cg@exept.de>
parents: 3340
diff changeset
   925
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   926
    idx := self indexOf:anElement.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   927
    idx == 0 ifTrue:[^ exceptionBlock value].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
   928
    ^ idx.
16002
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   929
!
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   930
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   931
largest:n
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   932
    "return a collection containing the n largest elements, largest last.
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   933
     Raises an exception, if the receiver does not contain at least n elements"
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   934
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   935
    |mySize|
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   936
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   937
    mySize := self size.
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   938
    n > mySize ifTrue:[
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   939
        self notEnoughElementsError
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   940
    ].
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   941
    sortBlock == DefaultSortBlock ifTrue:[
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   942
        ^ self copyFrom:(mySize-n+1)
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   943
    ].
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   944
    "/ do not trust the sortblock to sort small-to-large
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   945
    ^ super largest:n
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   946
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   947
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   948
     #(10 35 20 45 30 5) asSortedCollection largest:3  
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   949
     (#(10 35 20 45 30 5) asSortedCollection:[:a :b | a > b]) largest:3    
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   950
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   951
     #(10 35 20 45 30 5) asSortedCollection largest:6  
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   952
     #(10 35 20 45 30 5) asSortedCollection largest:7  
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   953
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   954
!
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   955
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   956
max
19074
e6e82ab60270 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18508
diff changeset
   957
    "return the maximum value in the receiver collection,
e6e82ab60270 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18508
diff changeset
   958
     redefined, since this can be easily computed.
e6e82ab60270 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18508
diff changeset
   959
     Raises an error, if the receiver is empty."
16002
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   960
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   961
    sortBlock == DefaultSortBlock ifTrue:[
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   962
        ^ self last
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   963
    ].
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   964
    ^ super max
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   965
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   966
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   967
     #(10 35 20 45 30 5) asSortedCollection max 
19075
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   968
     #(10 35 20 45 30 5) max 
19074
e6e82ab60270 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18508
diff changeset
   969
     #() asSortedCollection max 
16002
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   970
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   971
!
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   972
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   973
min
19074
e6e82ab60270 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18508
diff changeset
   974
    "return the minimum value in the receiver collection,
e6e82ab60270 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18508
diff changeset
   975
     redefined, since this can be easily computed.
e6e82ab60270 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18508
diff changeset
   976
     Raises an error, if the receiver is empty."
16002
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   977
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   978
    sortBlock == DefaultSortBlock ifTrue:[
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   979
        ^ self first
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   980
    ].
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   981
    ^ super min
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   982
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   983
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
   984
     #(10 35 20 45 30 5) asSortedCollection min
19075
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   985
     #(10 35 20 45 30 5) min
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   986
    "
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   987
!
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   988
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   989
minMax
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   990
    "return the minimum and maximum values in the receiver collection
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   991
     as a two element array, using #< to compare elements.
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   992
     Raises an error, if the receiver is empty."
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   993
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   994
    "return the minimum value in the receiver collection,
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   995
     redefined, since this can be easily computed.
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   996
     Raises an error, if the receiver is empty."
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   997
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   998
    sortBlock == DefaultSortBlock ifTrue:[
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
   999
        ^ { self first . self last }
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
  1000
    ].
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
  1001
    ^ super minMax
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
  1002
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
  1003
    "
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
  1004
     #(10 35 20 45 30 5) asSortedCollection minMax
3063ae9974c4 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19074
diff changeset
  1005
     #(10 35 20 45 30 5) minMax
16002
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1006
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1007
!
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1008
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1009
smallest:n
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1010
    "return a collection containing the n smallest elements, largest last.
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1011
     Raises an exception, if the receiver does not contain at least n elements"
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1012
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1013
    |mySize|
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1014
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1015
    mySize := self size.
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1016
    n > mySize ifTrue:[
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1017
        self notEnoughElementsError
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1018
    ].
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1019
    sortBlock == DefaultSortBlock ifTrue:[
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1020
        ^ self copyTo:n
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1021
    ].
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1022
    "/ do not trust the sortblock to sort small-to-large
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1023
    ^ super smallest:n
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1024
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1025
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1026
     #(10 35 20 45 30 5) asSortedCollection smallest:3  
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1027
     (#(10 35 20 45 30 5) asSortedCollection:[:a :b | a > b]) smallest:3    
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1028
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1029
     #(10 35 20 45 30 5) asSortedCollection smallest:6  
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1030
     #(10 35 20 45 30 5) asSortedCollection smallest:7  
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1031
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1032
! !
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1033
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1034
!SortedCollection methodsFor:'statistical functions'!
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1035
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1036
median
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1037
    "Return the middle element, or as close as we can get."
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1038
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1039
    ^ self basicAt:(self size + 1 // 2)
16002
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1040
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1041
    "
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1042
     #(10 35 20 45 30 5) asSortedCollection median
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1043
     #(10 35 20 45 30 5) median
5fd1486ee60a class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 16000
diff changeset
  1044
    "
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1045
! !
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1046
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1047
!SortedCollection methodsFor:'testing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1048
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1049
includes:anObject
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1050
    "return true, if the argument, anObject is in the collection.
62
e1b4369c61fb *** empty log message ***
claus
parents: 44
diff changeset
  1051
     Redefined, since due to being sorted, the inclusion check can
2
claus
parents: 1
diff changeset
  1052
     be done with log-n compares i.e. much faster."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1053
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1054
    |index "{ Class: SmallInteger }"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1055
     initialIndex "{ Class: SmallInteger }"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1056
     element|
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1057
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1058
    "/ if I am small, the inherited linear search is faster ...
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1059
    (lastIndex - firstIndex) < 20 ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1060
        firstIndex > lastIndex ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1061
            "/ empty
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1062
            ^ false
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1063
        ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1064
        ^ super includes:anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1065
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1066
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1067
    initialIndex := self indexForInserting:anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1068
    ((initialIndex < firstIndex) or:[initialIndex > lastIndex]) ifTrue:[^ false].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1069
    (contentsArray basicAt:initialIndex) = anObject ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1070
        "the simple case - plain objects"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1071
        ^ true.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1072
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1073
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1074
    "the complex case: the collection may include elements, which are odered only by
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1075
     a single component (e.g. Associations by key). So we have to test all
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1076
     previous and next elements having the same component"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1077
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1078
    "for previous elements: while element is not smaller and not larger than anObject ... compare"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1079
    index := initialIndex - 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1080
    [index >= firstIndex 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1081
     and:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1082
        element := contentsArray basicAt:index. 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1083
        ((sortBlock value:element value:anObject) or:[sortBlock value:anObject value:element]) not]
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1084
    ] whileTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1085
        element = anObject ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1086
            ^ true.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1087
        ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1088
        index := index - 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1089
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1090
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1091
    "for next elements: while element is not smaller and not larger than anObject ... compare"
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1092
    index := initialIndex + 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1093
    [index <= lastIndex 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1094
     and:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1095
        element := contentsArray basicAt:index. 
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1096
        ((sortBlock value:element value:anObject) or:[sortBlock value:anObject value:element]) not]
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1097
    ] whileTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1098
        element = anObject ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1099
            ^ true.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1100
        ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1101
        index := index + 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1102
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1103
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1104
    ^ false.
2
claus
parents: 1
diff changeset
  1105
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1106
    "
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1107
     #(7 3 9 10 99) asSortedCollection includes:50
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1108
     #(7 3 9 10 99) asSortedCollection includes:10
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1109
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1110
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1111
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1112
occurrencesOf:anObject
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1113
    "return how many times the argument, anObject is in the collection.
62
e1b4369c61fb *** empty log message ***
claus
parents: 44
diff changeset
  1114
     Redefined, since due to being sorted, the range of checked objects
5048
b1e10ce753fd comment
Claus Gittinger <cg@exept.de>
parents: 5030
diff changeset
  1115
     can be limited i.e. it can be done much faster.
b1e10ce753fd comment
Claus Gittinger <cg@exept.de>
parents: 5030
diff changeset
  1116
      Uses #= (i.e. equality) compare."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1117
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1118
    |index      "{ Class: SmallInteger }"
1162
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1119
     tally      "{ Class: SmallInteger }"
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1120
     last       "{ Class: SmallInteger }" |
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1121
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1122
    index := self indexOf:anObject.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1123
    index == 0 ifTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1124
        ^ 0
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1125
    ].
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1126
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1127
    index := index + firstIndex - 1.
8874
f1fdda306d51 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8183
diff changeset
  1128
    last := lastIndex.
1162
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1129
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1130
    "/ there may be multiple of them; count 'em
32
ee1a621c696c *** empty log message ***
claus
parents: 13
diff changeset
  1131
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1132
    tally := 0.
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1133
    [(index <= last) and:[(contentsArray basicAt:index) = anObject]] whileTrue:[
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1134
        tally := tally + 1.
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1135
        index := index + 1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1136
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1137
    ^ tally
2
claus
parents: 1
diff changeset
  1138
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1139
    "
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1140
     #(7 3 9 10 99) asSortedCollection occurrencesOf:50
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1141
     #(7 3 9 10 99) asSortedCollection occurrencesOf:10
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1142
     #(7 10 3 10 9 10 10 10 10 10 10 10 10 99) asSortedCollection occurrencesOf:10
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1143
    "
1162
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1144
3995101dfa44 changed for new #makeRoomAtIndex:; added comments
Claus Gittinger <cg@exept.de>
parents: 1156
diff changeset
  1145
    "Modified: 12.4.1996 / 18:48:40 / cg"
77
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1146
! !
6c38ca59927f *** empty log message ***
claus
parents: 62
diff changeset
  1147
629
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 607
diff changeset
  1148
!SortedCollection class methodsFor:'documentation'!
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 607
diff changeset
  1149
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 607
diff changeset
  1150
version
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1151
    ^ '$Header$'
14309
602e61cb64a3 Remove now unused helper method
Stefan Vogel <sv@exept.de>
parents: 14308
diff changeset
  1152
!
602e61cb64a3 Remove now unused helper method
Stefan Vogel <sv@exept.de>
parents: 14308
diff changeset
  1153
602e61cb64a3 Remove now unused helper method
Stefan Vogel <sv@exept.de>
parents: 14308
diff changeset
  1154
version_CVS
18508
cd84f2138c53 class: SortedCollection
Stefan Vogel <sv@exept.de>
parents: 16002
diff changeset
  1155
    ^ '$Header$'
629
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 607
diff changeset
  1156
! !
7300
461bb09c5954 category
Claus Gittinger <cg@exept.de>
parents: 6737
diff changeset
  1157
16000
74d0c38d1834 class: SortedCollection
Claus Gittinger <cg@exept.de>
parents: 14310
diff changeset
  1158
607
a9a526c51233 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1159
SortedCollection initialize!