Merge jv
authorHG Automerge
Wed, 25 Jan 2017 17:16:40 +0000
branchjv
changeset 4290 d7d8e72b093f
parent 4289 117a575c5b99 (current diff)
parent 4275 f19e46851a8e (diff)
child 4309 637a89222029
Merge
--- a/AATreeNode.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/AATreeNode.st	Wed Jan 25 17:16:40 2017 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libbasic2' }"
 
+"{ NameSpace: Smalltalk }"
+
 BinaryTreeNode subclass:#AATreeNode
 	instanceVariableNames:'level'
 	classVariableNames:''
@@ -50,17 +52,17 @@
 
 !AATreeNode methodsFor:'accessing'!
 
-data:dataArg level:levelArg
+data:dataArg level:levelIntegerArg
     data := dataArg.
-    level := levelArg.
+    level := levelIntegerArg.
 !
 
 level
     ^ level
 !
 
-level:something
-    level := something.
+level:anInteger
+    level := anInteger.
 ! !
 
 !AATreeNode methodsFor:'helpers'!
@@ -313,10 +315,10 @@
 !AATreeNode class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/AATreeNode.st,v 1.7 2013-12-16 13:34:22 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic2/AATreeNode.st,v 1.7 2013-12-16 13:34:22 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/AVLTree.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/AVLTree.st	Wed Jan 25 17:16:40 2017 +0000
@@ -281,16 +281,16 @@
     ^ left
 !
 
-left:something
-    left := something.
+left:aTreeNode
+    left := aTreeNode.
 !
 
 right
     ^ right
 !
 
-right:something
-    right := something.
+right:aTreeNode
+    right := aTreeNode.
 !
 
 value
--- a/BayesClassifier.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/BayesClassifier.st	Wed Jan 25 17:16:40 2017 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2016 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libbasic2' }"
 
 "{ NameSpace: Smalltalk }"
@@ -11,6 +22,21 @@
 
 !BayesClassifier class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2016 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+
+"
+!
+
 documentation
 "
     an initial experiment in bayes text classification.
--- a/HierarchicalURI.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/HierarchicalURI.st	Wed Jan 25 17:16:40 2017 +0000
@@ -300,7 +300,9 @@
 
 hash
 
-    ^ pathSegments hash xor:query hash
+    ^ pathSegments hash bitXor:query hash
+
+    "Modified: / 20-01-2017 / 19:49:30 / stefan"
 ! !
 
 !HierarchicalURI methodsFor:'copying'!
--- a/MappedCollection.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/MappedCollection.st	Wed Jan 25 17:16:40 2017 +0000
@@ -133,34 +133,10 @@
 
 !MappedCollection methodsFor:'enumerating'!
 
-collect:aBlock
-    "for each element in the receiver, evaluate the argument, aBlock
-     and return a new collection with the results"
-
-    |newCollection|
-
-    newCollection := self speciesForAdding new:self size.
-    self do:[:each | newCollection add:(aBlock value:each)].
-    ^ newCollection
-!
-
 do:aBlock
     "evaluate the argument, aBlock for each element"
 
     map do:[:mapValue | aBlock value:(domain at:mapValue)].
-!
-
-select:aBlock
-    "return a new collection with all elements from the receiver, for which
-     the argument aBlock evaluates to true"
-
-    |newCollection|
-
-    newCollection := self speciesForAdding new:self size.
-    self do:[:each |
-        (aBlock value:each) ifTrue:[newCollection add:each].
-    ].
-    ^ newCollection
 ! !
 
 !MappedCollection methodsFor:'private'!
--- a/SplittingWriteStream.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/SplittingWriteStream.st	Wed Jan 25 17:16:40 2017 +0000
@@ -1,5 +1,14 @@
-"{ Encoding: utf8 }"
+"
+ COPYRIGHT (c) 1999 by eXept Software AG
+              All Rights Reserved
 
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libbasic2' }"
 
 "{ NameSpace: Smalltalk }"
@@ -13,6 +22,21 @@
 
 !SplittingWriteStream class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 1999 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+
+"
+!
+
 documentation
 "
     A stream duplicator - everything written onto a splittingWriteStream
@@ -165,6 +189,6 @@
 !SplittingWriteStream class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/SplittingWriteStream.st,v 1.5 2015-03-13 12:38:16 stefan Exp $'
+    ^ '$Header$'
 ! !
 
--- a/StringPattern.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/StringPattern.st	Wed Jan 25 17:16:40 2017 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2011 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libbasic2' }"
 
 "{ NameSpace: Smalltalk }"
@@ -39,6 +50,21 @@
 
 !StringPattern class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2011 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+
+"
+!
+
 documentation
 "
     A StringPattern instances are used to match string. The
--- a/TerminalSession.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/TerminalSession.st	Wed Jan 25 17:16:40 2017 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2013 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libbasic2' }"
 
 "{ NameSpace: Smalltalk }"
@@ -15,6 +26,21 @@
 
 !TerminalSession class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2013 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+
+"
+!
+
 documentation
 "
     This keeps the state and API to interact with another program
--- a/TextClassifier.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/TextClassifier.st	Wed Jan 25 17:16:40 2017 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2016 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libbasic2' }"
 
 "{ NameSpace: Smalltalk }"
@@ -12,6 +23,21 @@
 
 !TextClassifier class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2016 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice. This software may not
+ be provided or otherwise made available to, or used by, any
+ other person. No title to or ownership of the software is
+ hereby transferred.
+
+"
+!
+
 documentation
 "
     an initial experiment in text classification.
--- a/TreeSet.st	Fri Jan 20 20:17:20 2017 +0000
+++ b/TreeSet.st	Wed Jan 25 17:16:40 2017 +0000
@@ -95,15 +95,20 @@
 	^ self bucket: bucket includes: anObject
 !
 
-intersection: aCollection
-	aCollection species = self species ifFalse: [^ super intersection: aCollection].
-	aCollection sortSelector = self sortSelector ifFalse: [^ super intersection: aCollection].
-	
-	^ Array streamContents:
-		[:s |
-		tree commonKeysWith: aCollection tree keysAndValuesDo:
-			[:key :left :right |
-			s nextPutAll: (left intersection: right)]]
+intersect:aCollection 
+    aCollection species ~~ self species ifTrue:[
+        ^ super intersect:aCollection
+    ].
+    aCollection sortSelector ~= self sortSelector ifTrue:[
+        ^ super intersect:aCollection
+    ].
+    ^ Array 
+        streamContents:[:s | 
+            tree commonKeysWith:aCollection tree
+                keysAndValuesDo:[:key :left :right | s nextPutAll:(left intersect:right)]
+        ]
+
+    "Created: / 20-01-2017 / 19:23:01 / stefan"
 !
 
 remove: anObject