Skip to content

Commit 3b3cd64

Browse files
olekscodeolekscode
committed
Committing a lot of changes at once (I had problems with Iceberg)
1 parent 4dab9a2 commit 3b3cd64

File tree

45 files changed

+444
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+444
-303
lines changed

‎DataFrame-Core.package/Behavior.extension/instance/inheritsFromOrEqualTo..st‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*DataFrame-Core
2+
inheritsFromOrEqualTo: aClass
3+
"Answer whether the argument, aClass, is equal to the receiver or belongs to its superclass chain."
4+
5+
^ (self == aClass) or: (self inheritsFrom: aClass)

‎DataFrame-Core.package/Behavior.extension/properties.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name" : "Behavior"
3+
}

‎DataFrame-Core.package/DataDimensions.class/properties.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"commentStamp" : "<historical>",
33
"super" : "Point",
4-
"category" : "DataFrame-Core",
4+
"category" : "DataFrame-Core-DataFrame-Core",
55
"classinstvars" : [ ],
66
"pools" : [ ],
77
"classvars" : [ ],

‎DataFrame-Core.package/DataFrame.class/instance/at..st‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
accessing
2+
at: aNumber
3+
4+
^ self rowAt: aNumber

‎DataFrame-Core.package/DataFrame.class/instance/on.select.with..st‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
as yet unclassified
2+
on: columns select: aBlock with: columnArgs
3+
4+
^ (self columns: columns)
5+
select: aBlock
6+
with: columnArgs.

‎DataFrame-Core.package/DataFrame.class/instance/on.select.with.groupedBy..st‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
as yet unclassified
2+
on: columns select: aBlock with: columnArgs groupedBy: colsToGroup
3+
4+
^ (self on: columns
5+
select: aBlock
6+
with: columnArgs)
7+
groupBy: colsToGroup.

‎DataFrame-Core.package/DataFrame.class/instance/printOn..st‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
printing
22
printOn: aStream
33

4-
( self numberOfRows = 0 )
4+
DataPrettyPrinter new print: self on: aStream.
5+
6+
"( self numberOfRows = 0 )
57
ifTrue: [ super printOn: aStream.
68
aStream nextPutAll:' uninitialized'. ^ self ].
79
@@ -17,26 +19,26 @@ printOn: aStream
1719
1820
1 to: self numberOfColumns - 1 do: [ :j |
1921
(self at: i at: j) printOn: aStream.
20-
aStream space ].
22+
aStream space ]."
2123

2224
"Last one without a space"
23-
(self at: i
25+
"(self at: i
2426
at: self numberOfColumns)
2527
printOn: aStream.
2628
27-
aStream cr ].
29+
aStream cr ]."
2830

2931
"Last one without new line"
30-
(self rowNames at: self numberOfRows) printOn: aStream.
32+
"(self rowNames at: self numberOfRows) printOn: aStream.
3133
aStream tab.
3234
3335
1 to: self numberOfColumns - 1 do: [ :j |
3436
(self at: self numberOfRows at: j) printOn: aStream.
35-
aStream space ].
37+
aStream space ]."
3638

3739
"Last one without a space"
38-
(self
40+
"(self
3941
at: self numberOfRows
4042
at: self numberOfColumns)
4143
printOn: aStream.
42-
aStream space.
44+
aStream space."

‎DataFrame-Core.package/DataFrame.class/instance/select..st‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
enumerating
2-
select: aBlock
2+
select: aBlock
3+
"Evaluate aBlock with each of the receiver's elements as the argument.
4+
Collect into a new collection like the receiver, only those elements for
5+
which aBlock evaluates to true. Answer the new collection."
36

4-
| df |
5-
df := super select: aBlock.
6-
df columnNames: columnNames.
7+
| selectedRowNumbers df |
8+
9+
selectedRowNumbers := LinkedList new.
10+
11+
1 to: self numberOfRows do: [ :i |
12+
(aBlock value: (self rowAt: i))
13+
ifTrue: [ selectedRowNumbers add: i ] ].
14+
15+
df := self class new:
16+
(selectedRowNumbers size @ self numberOfColumns).
17+
18+
df rowNames: (selectedRowNumbers collect: [ :i |
19+
self rowNames at: i ]).
20+
21+
df columnNames: self columnNames.
22+
23+
selectedRowNumbers doWithIndex: [ :rowNumber :i |
24+
df rowAt: i put: (self rowAt: rowNumber) ].
25+
726
^ df

‎DataFrame-Core.package/DataFrame.class/instance/select.with..st‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ select: aBlock with: anArray
33

44
( anArray size = 1 ) ifTrue: [
55
^ self select: [ :row |
6-
aBlock value: (row at: (anArray at: 1)) ] ].
6+
aBlock value: (row atKey: (anArray at: 1)) ] ].
77

88
( anArray size = 2 ) ifTrue: [
99
^ self select: [ :row |
1010
aBlock
11-
value: (row at: (anArray at: 1))
12-
value: (row at: (anArray at: 2)) ] ].
11+
value: (row atKey: (anArray at: 1))
12+
value: (row atKey: (anArray at: 2)) ] ].
1313

1414
( anArray size = 3 ) ifTrue: [
1515
^ self select: [ :row |
1616
aBlock
17-
value: (row at: (anArray at: 1))
18-
value: (row at: (anArray at: 2))
19-
value: (row at: (anArray at: 3)) ] ].
17+
value: (row atKey: (anArray at: 1))
18+
value: (row atKey: (anArray at: 2))
19+
value: (row atKey: (anArray at: 3)) ] ].
2020

2121
Error signal: 'Too many arguments'.

DataFrame-FTable.package/DataFrame.extension/instance/show.st renamed to DataFrame-Core.package/DataFrame.class/instance/show.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*DataFrame-FTable
1+
as yet unclassified
22
show
33

44
self showWithGlamour

0 commit comments

Comments
 (0)