Squeak-dev September 2014

squeak-dev@lists.squeakfoundation.org

49 participants
162 discussions

The Trunk: Collections-nice.583.mcz
by commits＠source.squeak.org 19 Sep '14

19 Sep '14

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.583.mcz ==================== Summary ==================== Name: Collections-nice.583 Author: nice Time: 19 September 2014, 10:54:26.296 pm UUID: 7c0afd87-bf86-40d5-890e-eb3f4ad51e68 Ancestors: Collections-nice.582 Also classify these SortFunction support in *Collections rather than *Kernel =============== Diff against Collections-nice.582 =============== Item was added: + ----- Method: BlockClosure>>asSortFunction (in category '*Collections-Support-sorting') ----- + asSortFunction + + ^self ascending! Item was added: + ----- Method: BlockClosure>>ascending (in category '*Collections-Support-sorting') ----- + ascending + "Return a SortFunction around the receiver. If the receiver is a 2 arg block, it is assumed it will do the collation directly itself, returning -1, 0, or 1. If the receiver is a one arg block, it will be evaluated for each a and b and of the sort input, and the result of sending <=> to those will be used." + + | function | + function := SortFunction ascend. + self numArgs = 1 ifTrue: [function monadicBlock: self]. + self numArgs = 2 ifTrue: [function collator: self]. + ^function! Item was added: + ----- Method: BlockClosure>>descending (in category '*Collections-Support-sorting') ----- + descending + "Opposite direction as ascending." + + ^self ascending toggleDirection!

1 0

The Trunk: Kernel-nice.873.mcz
by commits＠source.squeak.org 19 Sep '14

19 Sep '14

Nicolas Cellier uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-nice.873.mcz ==================== Summary ==================== Name: Kernel-nice.873 Author: nice Time: 19 September 2014, 10:45:30.606 pm UUID: c17d3346-f7e5-49c3-8939-91c7606954ef Ancestors: Kernel-eem.872 Add spaceship operator support <=> usefull for sort functions. =============== Diff against Kernel-eem.872 =============== Item was added: + ----- Method: Magnitude>><=> (in category 'sorting') ----- + <=> anotherObject + "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. + See also: http://en.wikipedia.org/wiki/Spaceship_operator" + + ^self = anotherObject + ifTrue: [0] + ifFalse: [self < anotherObject ifTrue: [-1] ifFalse: [1]]!

1 0

Re: [squeak-dev] The Trunk: Collections-nice.582.mcz
by Frank Shearar 19 Sep '14

19 Sep '14

On 19 September 2014 21:24, <commits(a)source.squeak.org> wrote: > Nicolas Cellier uploaded a new version of Collections to project The Trunk: > http://source.squeak.org/trunk/Collections-nice.582.mcz > > ==================== Summary ==================== > > Name: Collections-nice.582 > Author: nice > Time: 19 September 2014, 10:22:13.338 pm > UUID: 52a598f1-224e-4649-a95f-4e78547b5ed5 > Ancestors: Collections-nice.581 > > Port TAG-SortFunctions of Travis Griggs from Cincom public store - version (11,tgriggs) Looks cool! What's its licence? MIT? (He says, hopefully) frank

1 0

The Trunk: Collections-nice.582.mcz
by commits＠source.squeak.org 19 Sep '14

19 Sep '14

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.582.mcz ==================== Summary ==================== Name: Collections-nice.582 Author: nice Time: 19 September 2014, 10:22:13.338 pm UUID: 52a598f1-224e-4649-a95f-4e78547b5ed5 Ancestors: Collections-nice.581 Port TAG-SortFunctions of Travis Griggs from Cincom public store - version (11,tgriggs) Note that no collation policy were used for String. The spaceship operator <=> is also required in Kernel-Numbers. See also the blog http://objology.blogspot.fr/2010/11/tag-sortfunctions.html and http://objology.blogspot.fr/2010/11/tag-sortfunctions-redux.html Note about the cost of these sort functions: as shown by this mini-bench on cog, using a Symbol costs a bit more (perform:) than a block activation, and monadic block a bit more than dyadic one because activated twice more, but it seems acceptable to me with regard to the great simplification and expressiveness of code : | collec1 collec2 collec3 | collec1 := (1 to: 200000) collect: [:i | 1000000 atRandom-500000]. collec2 := collec1 copy. collec3 := collec1 copy. { [collec1 sort: [:a :b | a abs < b abs]] timeToRun. [collec2 sort: [:e | e abs] ascending] timeToRun. [collec3 sort: #abs ascending] timeToRun. } #(345 532 912) =============== Diff against Collections-nice.581 =============== Item was added: + SortFunction subclass: #ChainedSortFunction + instanceVariableNames: 'next' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Support'! + + !ChainedSortFunction commentStamp: 'nice 3/13/2014 22:25' prior: 0! + I add to my parent the idea of a "next" function to use when two objects are equal by my particular collator. + + Usage + + SortFunctions can be chained together in primary, secondary, tertiary, etc order using the comma method. Consider a sequence of customer objects, where each customer object responds to the messages firstName, lastName, and age. If we want to sort them lastName first, then firstName, and finally oldest first, we would use an expression like: + + customers sort: #lastName ascending, #firstName ascending, #age descending + + As noted in my super's comment, unary symbols or single arg blocks can be used. One can omit the the ascending methods on arguments (not the receiver), it will default blocks or symbols to be ascending if none is specified. In other words, the above expression could be simplified slightly as + + customers sort: #lastName ascending, #firstName, #age descending + + (note the missing ascending on the #firstName argument) + + Instance Variables + next <SortFunction> the next SortFunction to evaluate in the event my evaluator results in equal values. + + ! Item was added: + ----- Method: ChainedSortFunction>>, (in category 'converting') ----- + , aSortFunction + + self next: next , aSortFunction! Item was added: + ----- Method: ChainedSortFunction>>next: (in category 'initialize-release') ----- + next: anObject + + next := anObject! Item was added: + ----- Method: ChainedSortFunction>>value:value: (in category 'evaluating') ----- + value: anObject value: bObject + "Refinement of the parent behavior. If the result of my collator is 0, then pass on to the next variable to work it out." + + | result | + result := (collator value: anObject value: bObject) * direction. + ^result isZero + ifTrue: [next value: anObject value: bObject] + ifFalse: [result < 0]! Item was added: + Object subclass: #SortFunction + instanceVariableNames: 'direction collator' + classVariableNames: '' + poolDictionaries: '' + category: 'Collections-Support'! + + !SortFunction commentStamp: 'nice 3/13/2014 22:24' prior: 0! + I am intended to be used in place of two arg sort blocks. + + Usage + + In the following example, an ascending SortFunction is created based on the result of the #first message send to each object. + #(#(1 2) #(2 3) #(0 0)) sorted: #first ascending. + + To sort by the #last element, but descending, the following would be used: + #(#(1 2) #(2 3) #(0 0)) sorted: #last descending. + + One can use blocks as well. The following sorts in descending order, the sub elements based on the sum of their values. + | sumBlock | + sumBlock := [:sequence | sequence inject: 0 into: [:sum :each | sum + each]]. + #(#(1 2) #(2 3) #(0 0)) sorted: sumBlock descending. + + One can even use 2 arg blocks, for those cases where the function isn't expressible with objects that respond to < and =. The only catch, is that such a function has to return not true and false, but instead a collation order, values of -1 (for before), 0 (the same) or 1 (to follow). For example: + + | oddBlock | + oddBlock := + [:a :b | + a odd = b odd ifTrue: [0] ifFalse: [a odd ifTrue: [-1] ifFalse: [1]]]. + #(1 5 1 3 2 7 9 4 6) asSortedCollection: oddBlock descending + + Instance Variables + collator <BlockClosure> This is the collation function that must return a -1, 0, or 1. It is usually composed by an initialization method such as sendMessage: or monadicBlock:, but may be set directly. + direction <SmallInteger> 1 for ascending, -1 for descending + + ! Item was added: + ----- Method: SortFunction class>>ascend (in category 'instance creation') ----- + ascend + + ^self new ascend! Item was added: + ----- Method: SortFunction class>>descend (in category 'instance creation') ----- + descend + + ^self new descend! Item was added: + ----- Method: SortFunction>>, (in category 'converting') ----- + , aSortFunction + "Return a new SortFunction which is the concatenation of aSortFunction to me, I will be the primary sort, but if I compare equal, I will defer to the argument." + + ^(ChainedSortFunction new) + collator: collator; + direction: direction; + next: aSortFunction asSortFunction! Item was added: + ----- Method: SortFunction>>asSortFunction (in category 'converting') ----- + asSortFunction + + ^self! Item was added: + ----- Method: SortFunction>>ascend (in category 'initailize-release') ----- + ascend + + direction := 1! Item was added: + ----- Method: SortFunction>>collator: (in category 'initailize-release') ----- + collator: a2ArgBlock + "a2ArgBlock MUST return the collation order, -1, 0, or 1" + + collator := a2ArgBlock! Item was added: + ----- Method: SortFunction>>descend (in category 'initailize-release') ----- + descend + + direction := -1! Item was added: + ----- Method: SortFunction>>direction: (in category 'initailize-release') ----- + direction: anInteger + + direction := anInteger! Item was added: + ----- Method: SortFunction>>isAscending (in category 'testing') ----- + isAscending + + ^direction = 1! Item was added: + ----- Method: SortFunction>>isDescending (in category 'testing') ----- + isDescending + + ^direction = -1! Item was added: + ----- Method: SortFunction>>monadicBlock: (in category 'initailize-release') ----- + monadicBlock: aSingleArgBlock + "Initialze the receiver's collation block to compare the results of evaluating aSingleArgBlock with each argument, and then collate the return values with the <=> method." + + collator := [:a :b | (aSingleArgBlock value: a) <=> (aSingleArgBlock value: b)]! Item was added: + ----- Method: SortFunction>>sendMessage: (in category 'initailize-release') ----- + sendMessage: aUnarySymbol + "Initialze the receiver's collation block to compare the results of sending aUnarySymbol to each argument, and then collate them with the <=> method." + + collator := [:a :b | (a perform: aUnarySymbol) <=> (b perform: aUnarySymbol)]! Item was added: + ----- Method: SortFunction>>toggleDirection (in category 'converting') ----- + toggleDirection + "Invert my current direction, if I'm currently ascending, this will cause me to be descending now, and vice-versa." + + direction := direction * -1! Item was added: + ----- Method: SortFunction>>value:value: (in category 'evaluating') ----- + value: anObject value: bObject + "Masquerade as a two argument block, used by many of the sorting APIs, by returning whether anObject should be placed before bObject or not." + + | result | + result := (collator value: anObject value: bObject) * direction. + ^result <= 0! Item was added: + ----- Method: String>><=> (in category 'sorting') ----- + <=> aCharacterArray + "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. + See also: http://en.wikipedia.org/wiki/Spaceship_operator" + + ^self = aCharacterArray + ifTrue: [ 0 ] + ifFalse: [self < aCharacterArray + ifTrue: [ -1 ] + ifFalse: [ 1 ]]! Item was added: + ----- Method: Symbol>>asSortFunction (in category 'sorting') ----- + asSortFunction + + ^self ascending! Item was added: + ----- Method: Symbol>>ascending (in category 'sorting') ----- + ascending + "Return a SortFunction around the receiver, where the receiver will be used as a unary message to send to both a and b during sorting, and then the result of said send will be collated in ascending order using the <=> method." + "Example: #('abc' 'de' 'fghi') sorted: #size asscending" + + ^SortFunction ascend sendMessage: self! Item was added: + ----- Method: Symbol>>descending (in category 'sorting') ----- + descending + "Return a SortFunction around the receiver, where the receiver will be used as a unary message to send to both a and b during sorting, and then the result of said send will be collated in descending order using the <=> method." + "Example: #('abc' 'de' 'fghi') sorted: #size descending" + + ^SortFunction descend sendMessage: self! Item was added: + ----- Method: Text>><=> (in category 'sorting') ----- + <=> aCharacterArray + "Return a collation order of -1, 0, or 1, indicating whether I should be collated before the receiver, am equal, or after. + See also: http://en.wikipedia.org/wiki/Spaceship_operator" + + ^string = aCharacterArray + ifTrue: [ 0 ] + ifFalse: [string < aCharacterArray asString + ifTrue: [ -1 ] + ifFalse: [ 1 ]]!

1 0

Next version of Date, DateAndTime, and Duration API updates
by Chris Cunningham 19 Sep '14

19 Sep '14

Now in the InBox: KernelTests-cbc.278.mcz Kernel-cbc.871.mcz The tests add in test for expected Duration addition and subtraction from each other, including the new GenericMonth and GenericYear, and the very new GenericDuration. It also adds a few more tests for LeapYear tests with adding years to them. The test are still based on what it currently does, with the exceptions listed previously (I haven't really changed any to expect failures, as has been suggested - that will come shortly. For now, I want to try to cause little to no changes o expected behavior first - just new behavior for now). Kernel adds the GenericDuration, and handles adding and subtracting GenericMonth, GenericYear, and GenericDurations togeher in a rational way. This involves turning + and - in Durations into a double-dispatch so that it will work. There are no comments yet in these classes - they will be there before the weekend is over at the latest. Any comments are more than welcome. -cbc

3 3

Re: [squeak-dev] The Inbox: KernelTests-cbc.277.mcz
by Chris Cunningham 19 Sep '14

19 Sep '14

This changes adds test for things like DateAndTime now + 2 days and DateAndTime now + 2 (the later of which adds two nanoSeconds - who would have guessed?) IT mostly tests to the current results of the most current Trunk, with a few exceptions: 1> Tests adding Months and Years, which currenty isn't supported (causes 13 errors), which are fixed in additional changes (covered in another email). If those changes are not acceptable, I can remove them.... 2> And error on TestSubtractString. Currently, it treats adding strings as if they were durations, but since String responds to #asDateAndTime, it treats them as if they were DateAndTime strings. I'd rather see them as durations in both cases, so expected to see it as a duration for subtracting, which causes an error. If this is wrong and the general expectation is that they should be DateAndTimes for subtracting and Durations for adding, I can change the test. (But it is really confusing and not clear!) 3> A failure in TestSubtractTime. Currently, Squeak treats adding a time as adding the time to the DateAndTime; but it treats subtracting a time as trying to figure out the difference between the DateAndTime and a a DateAndTime of the current date with the time portion set to the time. This is conterintuitive - does anyone expect this (or see any reason it would make sense)? I have setup the test to treat it as if we wanted to jut subtract whatever the time is from the DateAndTime. 4> A failure in TestSubtractTimespan. Currently, Squeak treats adding a Timespan to the DateAndTime as adding the span of time represented by Timespan to the DateAndTime. It treats subtracting the same as if you wanted the difference between the DateAndTime and the first (starting) dateAndTime of the TimeSpan. I would assume what is really wanted would be to subract the space of time from the DateAndTime instead. Does anyone dissagree with this desire? If these tests are acceptable, I can modify the behaviour to match the tests. If the current behaviour is correct, however, I can alter the tests to match that behaviour. What is the consensus? In either case, I would like to see these tests (possibly sanitized) added to Trunk, please. -cbc On Sat, Sep 13, 2014 at 10:00 PM, <commits(a)source.squeak.org> wrote: > A new version of KernelTests was added to project The Inbox: > http://source.squeak.org/inbox/KernelTests-cbc.277.mcz > > ==================== Summary ==================== > > Name: KernelTests-cbc.277 > Author: cbc > Time: 13 September 2014, 9:58:54.543 pm > UUID: 035509c9-a60f-b44f-b55b-a17428783aa9 > Ancestors: KernelTests-dtl.276 > > Added DateAndTimeArithmeticTest - to test adding things to DateAndTime > instances. This includes things like: DateAndTime now + 3 days. > Test convering adding various durations (like above) as well as addint > strings, numbers, Timespans, Times, and DatAndTimes. > Also tests subtracting the same. > > =============== Diff against KernelTests-dtl.276 =============== > > Item was added: > + TestCase subclass: #DateAndTimeArithmeticTest > + instanceVariableNames: '' > + classVariableNames: '' > + poolDictionaries: '' > + category: 'KernelTests-Chronology'! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddDateAndTime1 (in > category 'testing') ----- > + testAddDateAndTime1 > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + > (DateAndTime year: 2014 month: 3 day: 31)) = (DateAndTime year: 2014 month: > 1 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddDateAndTime2 (in > category 'testing') ----- > + testAddDateAndTime2 > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) + > (DateAndTime year: 2014 month: 1 day: 31)) = (DateAndTime year: 2014 month: > 3 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddDays (in category > 'testing') ----- > + testAddDays > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2 days) > = (DateAndTime year: 2014 month: 2 day: 2)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddHours (in category > 'testing') ----- > + testAddHours > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2 hours) > = (DateAndTime year: 2014 month: 1 day: 31 hour: 2 minute: 0)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddIntegers (in category > 'testing') ----- > + testAddIntegers > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2) = > (DateAndTime year: 2014 month: 1 day: 31 hour: 0 minute: 0 second: 0 > nanoSecond: 000000002 offset: DateAndTime localOffset)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddMinutes (in category > 'testing') ----- > + testAddMinutes > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2 > minutes) = (DateAndTime year: 2014 month: 1 day: 31 hour: 0 minute: 2)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddMonths1 (in category > 'testing') ----- > + testAddMonths1 > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 1 month) > = (DateAndTime year: 2014 month: 2 day: 28)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddMonths2 (in category > 'testing') ----- > + testAddMonths2 > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2 > months) = (DateAndTime year: 2014 month: 3 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddMonths4 (in category > 'testing') ----- > + testAddMonths4 > + self assert: ((DateAndTime year: 2004 month: 1 day: 31) + 1 month) > = (DateAndTime year: 2004 month: 2 day: 29)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddNanoSeconds (in category > 'testing') ----- > + testAddNanoSeconds > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2 > nanoSeconds) = (DateAndTime year: 2014 month: 1 day: 31 hour: 0 minute: 0 > second: 0 nanoSecond: 000000002 offset: DateAndTime localOffset)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddSeconds (in category > 'testing') ----- > + testAddSeconds > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2 > seconds) = (DateAndTime year: 2014 month: 1 day: 31 hour: 0 minute: 0 > second: 2)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddStrings (in category > 'testing') ----- > + testAddStrings > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + > '02:00:00:00') = (DateAndTime year: 2014 month: 2 day: 2)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddTime (in category > 'testing') ----- > + testAddTime > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + > ('02:00:00' asTime)) = (DateAndTime year: 2014 month: 1 day: 31 hour: 2 > minute: 0)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddTimespan (in category > 'testing') ----- > + testAddTimespan > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) > + + ((DateAndTime year: 2014 month: 1 day: 1) to: > (DateAndTime year: 2014 month: 1 day: 3))) > + = (DateAndTime year: 2014 month: 2 day: 2 hour: 0 minute: > 0)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddWeeks (in category > 'testing') ----- > + testAddWeeks > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) + 2 weeks) > = (DateAndTime year: 2014 month: 2 day: 14) > + > + ! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddYears1 (in category > 'testing') ----- > + testAddYears1 > + self assert: ((DateAndTime year: 2006 month: 1 day: 31) + 2 years) > = (DateAndTime year: 2008 month: 1 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddYears2 (in category > 'testing') ----- > + testAddYears2 > + self assert: ((DateAndTime year: 2007 month: 1 day: 31) + 2 years) > = (DateAndTime year: 2009 month: 1 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testAddYears3 (in category > 'testing') ----- > + testAddYears3 > + self assert: ((DateAndTime year: 2004 month: 2 day: 29) + 1 year) > = (DateAndTime year: 2005 month: 2 day: 28)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractDateAndTime1 (in > category 'testing') ----- > + testSubtractDateAndTime1 > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - > (DateAndTime year: 2014 month: 1 day: 31)) = 59 days! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractDateAndTime2 (in > category 'testing') ----- > + testSubtractDateAndTime2 > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) - > (DateAndTime year: 2014 month: 3 day: 31)) = 59 days negated! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractDays (in category > 'testing') ----- > + testSubtractDays > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2 days) > = (DateAndTime year: 2014 month: 3 day: 29)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractHours (in category > 'testing') ----- > + testSubtractHours > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2 hours) > = (DateAndTime year: 2014 month: 3 day: 30 hour: 22 minute: 0)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractIntegers (in > category 'testing') ----- > + testSubtractIntegers > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2) = > (DateAndTime year: 2014 month: 3 day: 30 hour: 23 minute: 59 second: 59 > nanoSecond: 999999998 offset: DateAndTime localOffset)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractMinutes (in > category 'testing') ----- > + testSubtractMinutes > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2 > minutes) = (DateAndTime year: 2014 month: 3 day: 30 hour: 23 minute: 58)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractMonths1 (in > category 'testing') ----- > + testSubtractMonths1 > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 1 month) > = (DateAndTime year: 2014 month: 2 day: 28)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractMonths2 (in > category 'testing') ----- > + testSubtractMonths2 > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2 > months) = (DateAndTime year: 2014 month: 1 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractMonths3 (in > category 'testing') ----- > + testSubtractMonths3 > + self assert: ((DateAndTime year: 2014 month: 3 day: 14) - 1 month) > = (DateAndTime year: 2014 month: 2 day: 14)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractMonths4 (in > category 'testing') ----- > + testSubtractMonths4 > + self assert: ((DateAndTime year: 2004 month: 3 day: 31) - 1 month) > = (DateAndTime year: 2004 month: 2 day: 29)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractNanoSeconds (in > category 'testing') ----- > + testSubtractNanoSeconds > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2 > nanoSeconds) = (DateAndTime year: 2014 month: 3 day: 30 hour: 23 minute: 59 > second: 59 nanoSecond: 999999998 offset: DateAndTime localOffset)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractSeconds (in > category 'testing') ----- > + testSubtractSeconds > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2 > seconds) = (DateAndTime year: 2014 month: 3 day: 30 hour: 23 minute: 59 > second: 58)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractStrings (in > category 'testing') ----- > + testSubtractStrings > + self assert: ((DateAndTime year: 2014 month: 1 day: 31) - > '02:00:00:00') = (DateAndTime year: 2014 month: 3 day: 29)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractTime (in category > 'testing') ----- > + testSubtractTime > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - > ('02:00:00' asTime)) = (DateAndTime year: 2014 month: 3 day: 30 hour: 22 > minute: 0)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractTimespan (in > category 'testing') ----- > + testSubtractTimespan > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) > + - ((DateAndTime year: 2014 month: 1 day: 1) to: > (DateAndTime year: 2014 month: 1 day: 3))) > + = (DateAndTime year: 2014 month: 3 day: 29)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractWeeks (in category > 'testing') ----- > + testSubtractWeeks > + self assert: ((DateAndTime year: 2014 month: 3 day: 31) - 2 weeks) > = (DateAndTime year: 2014 month: 3 day: 17) > + > + ! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractYears1 (in category > 'testing') ----- > + testSubtractYears1 > + self assert: ((DateAndTime year: 2008 month: 1 day: 31) - 2 years) > = (DateAndTime year: 2006 month: 1 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractYears2 (in category > 'testing') ----- > + testSubtractYears2 > + self assert: ((DateAndTime year: 2009 month: 1 day: 31) - 2 years) > = (DateAndTime year: 2007 month: 1 day: 31)! > > Item was added: > + ----- Method: DateAndTimeArithmeticTest>>testSubtractYears3 (in category > 'testing') ----- > + testSubtractYears3 > + self assert: ((DateAndTime year: 2005 month: 2 day: 28) - 1 year) > = (DateAndTime year: 2004 month: 2 day: 28)! > > >

3 4

The Inbox: KernelTests-cbc.278.mcz
by commits＠source.squeak.org 19 Sep '14

19 Sep '14

A new version of KernelTests was added to project The Inbox: http://source.squeak.org/inbox/KernelTests-cbc.278.mcz ==================== Summary ==================== Name: KernelTests-cbc.278 Author: cbc Time: 18 September 2014, 11:20:23.145 pm UUID: db29e686-11d4-ae46-8c4d-e384ffab9bfa Ancestors: KernelTests-cbc.277 Added DurationArithmeticTest - tests expected outcomes of adding durations together, including the generic ones (resulting in GenericDuration instances). Also, tested for certain tricky leapYear conditions when adding years. Fixed expectations for subtracting Timespans from DateAndTime instances. =============== Diff against KernelTests-cbc.277 =============== Item was changed: ----- Method: DateAndTimeArithmeticTest>>testAddTimespan (in category 'testing') ----- testAddTimespan + self should: [((DateAndTime year: 2014 month: 1 day: 31) + + ((DateAndTime year: 2014 month: 1 day: 1) to: (DateAndTime year: 2014 month: 1 day: 3)))] + raise: Error + ! - self assert: ((DateAndTime year: 2014 month: 1 day: 31) - + ((DateAndTime year: 2014 month: 1 day: 1) to: (DateAndTime year: 2014 month: 1 day: 3))) - = (DateAndTime year: 2014 month: 2 day: 2 hour: 0 minute: 0)! Item was added: + ----- Method: DateAndTimeArithmeticTest>>testAddYears4 (in category 'testing') ----- + testAddYears4 + self assert: ((DateAndTime year: 2003 month: 4 day: 1) + 2 years) = (DateAndTime year: 2005 month: 4 day: 1)! Item was added: + ----- Method: DateAndTimeArithmeticTest>>testAddYears5 (in category 'testing') ----- + testAddYears5 + self assert: ((DateAndTime year: 2003 month: 4 day: 1) + 1 years) = (DateAndTime year: 2004 month: 4 day: 1)! Item was changed: ----- Method: DateAndTimeArithmeticTest>>testSubtractTimespan (in category 'testing') ----- testSubtractTimespan self assert: ((DateAndTime year: 2014 month: 3 day: 31) + - ((DateAndTime year: 2014 month: 3 day: 1) to: (DateAndTime year: 2014 month: 1 day: 3))) = ('30:00:00:00' asDuration)! - - ((DateAndTime year: 2014 month: 1 day: 1) to: (DateAndTime year: 2014 month: 1 day: 3))) - = (DateAndTime year: 2014 month: 3 day: 29)! Item was added: + ----- Method: DateAndTimeArithmeticTest>>testSubtractYears4 (in category 'testing') ----- + testSubtractYears4 + self assert: ((DateAndTime year: 2005 month: 4 day: 1) - 2 years) = (DateAndTime year: 2003 month: 4 day: 1)! Item was added: + ----- Method: DateAndTimeArithmeticTest>>testSubtractYears5 (in category 'testing') ----- + testSubtractYears5 + self assert: ((DateAndTime year: 2004 month: 4 day: 1) - 1 years) = (DateAndTime year: 2003 month: 4 day: 1)! Item was added: + TestCase subclass: #DurationArithmeticTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'KernelTests-Chronology'! Item was added: + ----- Method: DurationArithmeticTest>>testAddDayDurations (in category 'as yet unclassified') ----- + testAddDayDurations + self assert: (1 day + 2 days = 3 days)! Item was added: + ----- Method: DurationArithmeticTest>>testAddDayHourDurations (in category 'as yet unclassified') ----- + testAddDayHourDurations + self assert: (1 day + 2 hours = '1:02:00:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddDayMonthDurations (in category 'as yet unclassified') ----- + testAddDayMonthDurations + self assert: (1 day + 2 months = (GenericDuration new + 1 day + 2 months))! Item was added: + ----- Method: DurationArithmeticTest>>testAddHourDayDurations (in category 'as yet unclassified') ----- + testAddHourDayDurations + self assert: (1 hour + 2 days = '2:01:00:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddHourMinuteDurations (in category 'as yet unclassified') ----- + testAddHourMinuteDurations + self assert: (1 hour + 2 minutes = '0:01:02:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddMinuteHourDurations (in category 'as yet unclassified') ----- + testAddMinuteHourDurations + self assert: (1 minute + 2 hours = '0:02:01:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddMinuteSecondDurations (in category 'as yet unclassified') ----- + testAddMinuteSecondDurations + self assert: (1 minute + 2 seconds = '0:00:01:02' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddMonthDayDurations (in category 'as yet unclassified') ----- + testAddMonthDayDurations + self assert: (1 month + 2 days = (GenericDuration new + 1 month + 2 days))! Item was added: + ----- Method: DurationArithmeticTest>>testAddMonthYearDurations (in category 'as yet unclassified') ----- + testAddMonthYearDurations + self assert: (1 month + 2 years = (GenericDuration new + 1 month + 2 years))! Item was added: + ----- Method: DurationArithmeticTest>>testAddNanoSecondSecondDurations (in category 'as yet unclassified') ----- + testAddNanoSecondSecondDurations + self assert: (1 nanoSeconds + 2 seconds = '0:00:00:02.000000001' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddSecondMinuteDurations (in category 'as yet unclassified') ----- + testAddSecondMinuteDurations + self assert: (1 second + 2 minutes = '0:00:02:01' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddSecondNanoSecondDurations (in category 'as yet unclassified') ----- + testAddSecondNanoSecondDurations + self assert: (1 second + 2 nanoSeconds = '0:00:00:01.000000002' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testAddYearMonthDurations (in category 'as yet unclassified') ----- + testAddYearMonthDurations + self assert: (1 year + 2 months = (GenericDuration new + 1 year + 2 months))! Item was added: + ----- Method: DurationArithmeticTest>>testDayDurationAssociativeSubtractionWithDateTime (in category 'as yet unclassified') ----- + testDayDurationAssociativeSubtractionWithDateTime + self assert: (((DateAndTime year: 2014 month: 1 day: 31) - 1 hour - 1 day) + = ((DateAndTime year: 2014 month: 1 day: 31) - (1 hour + 1 day)))! Item was added: + ----- Method: DurationArithmeticTest>>testDayDurationAssociativeWithDateTime (in category 'as yet unclassified') ----- + testDayDurationAssociativeWithDateTime + self assert: (((DateAndTime year: 2014 month: 1 day: 31) + 1 hour + 1 day) + = ((DateAndTime year: 2014 month: 1 day: 31) + (1 hour + 1 day)))! Item was added: + ----- Method: DurationArithmeticTest>>testGenericDurationAddition (in category 'as yet unclassified') ----- + testGenericDurationAddition + self assert: (((1 month + 1 month) + (1 year + 1 year)) + = (1 month + 1 month + 1 year + 1 year))! Item was added: + ----- Method: DurationArithmeticTest>>testGenericDurationSubtraction (in category 'as yet unclassified') ----- + testGenericDurationSubtraction + self assert: (((1 month + 1 month) - (1 year + 1 year)) + = (1 month + 1 month - 1 year - 1 year))! Item was added: + ----- Method: DurationArithmeticTest>>testMonthDurationAssociativeSubtractionWithDateTime (in category 'as yet unclassified') ----- + testMonthDurationAssociativeSubtractionWithDateTime + self assert: (((DateAndTime year: 2014 month: 1 day: 31) - 1 month - 1 day) + = ((DateAndTime year: 2014 month: 1 day: 31) - (1 month + 1 day)))! Item was added: + ----- Method: DurationArithmeticTest>>testMonthDurationAssociativeWithDateTime (in category 'as yet unclassified') ----- + testMonthDurationAssociativeWithDateTime + self assert: (((DateAndTime year: 2014 month: 1 day: 31) + 1 month + 1 day) + = ((DateAndTime year: 2014 month: 1 day: 31) + (1 month + 1 day)))! Item was added: + ----- Method: DurationArithmeticTest>>testMonthDurationNotCommutative (in category 'as yet unclassified') ----- + testMonthDurationNotCommutative + self deny: ((1 month + 2 days) = (2 days + 1 month))! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractDayDurations (in category 'as yet unclassified') ----- + testSubtractDayDurations + self assert: (2 days - 1 day = 1 day)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractDayHourDurations (in category 'as yet unclassified') ----- + testSubtractDayHourDurations + self assert: (1 day - 2 hours = '0:22:00:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractDayMonthDurations (in category 'as yet unclassified') ----- + testSubtractDayMonthDurations + self assert: (1 day - 2 months = (GenericDuration new + 1 day - 2 months))! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractHourDayDurations (in category 'as yet unclassified') ----- + testSubtractHourDayDurations + self assert: (1 hour - 2 days = '-1:23:00:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractHourMinuteDurations (in category 'as yet unclassified') ----- + testSubtractHourMinuteDurations + self assert: (1 hour - 2 minutes = '0:00:58:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractMinuteHourDurations (in category 'as yet unclassified') ----- + testSubtractMinuteHourDurations + self assert: (1 minute - 2 hours = '-0:01:59:00' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractMinuteSecondDurations (in category 'as yet unclassified') ----- + testSubtractMinuteSecondDurations + self assert: (1 minute - 2 seconds = '0:00:00:58' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractMonthDayDurations (in category 'as yet unclassified') ----- + testSubtractMonthDayDurations + self assert: (1 month - 2 days = (GenericDuration new + 1 month - 2 days))! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractMonthYearDurations (in category 'as yet unclassified') ----- + testSubtractMonthYearDurations + self assert: (1 month - 2 years = (GenericDuration new + 1 month - 2 years))! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractNanoSecondSecondDurations (in category 'as yet unclassified') ----- + testSubtractNanoSecondSecondDurations + self assert: (1 nanoSeconds - 2 seconds = '-0:00:00:01.999999999' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractSecondMinuteDurations (in category 'as yet unclassified') ----- + testSubtractSecondMinuteDurations + self assert: (1 second - 2 minutes = '-0:00:01:59' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractSecondNanoSecondDurations (in category 'as yet unclassified') ----- + testSubtractSecondNanoSecondDurations + self assert: (1 second - 2 nanoSeconds = '0:00:00:00.999999998' asDuration)! Item was added: + ----- Method: DurationArithmeticTest>>testSubtractYearMonthDurations (in category 'as yet unclassified') ----- + testSubtractYearMonthDurations + self assert: (1 year - 2 months = (GenericDuration new + 1 year - 2 months))! Item was added: + ----- Method: DurationArithmeticTest>>testYearDurationAssociativeSubtractionWithDateTime (in category 'as yet unclassified') ----- + testYearDurationAssociativeSubtractionWithDateTime + self assert: (((DateAndTime year: 2014 month: 1 day: 31) - 1 year - 1 day) + = ((DateAndTime year: 2014 month: 1 day: 31) - (1 year + 1 day)))! Item was added: + ----- Method: DurationArithmeticTest>>testYearDurationAssociativeWithDateTime (in category 'as yet unclassified') ----- + testYearDurationAssociativeWithDateTime + self assert: (((DateAndTime year: 2014 month: 1 day: 31) + 1 year + 1 day) + = ((DateAndTime year: 2014 month: 1 day: 31) + (1 year + 1 day)))! Item was added: + ----- Method: DurationArithmeticTest>>testYearDurationNotCommutative (in category 'as yet unclassified') ----- + testYearDurationNotCommutative + self deny: ((1 year + 2 days) = (2 days + 1 year))!

1 0

The Inbox: Kernel-cbc.871.mcz
by commits＠source.squeak.org 19 Sep '14

19 Sep '14

A new version of Kernel was added to project The Inbox: http://source.squeak.org/inbox/Kernel-cbc.871.mcz ==================== Summary ==================== Name: Kernel-cbc.871 Author: cbc Time: 18 September 2014, 11:15:40.731 pm UUID: db75fc86-1341-8542-86df-8d6f5eb21d44 Ancestors: Kernel-cbc.870 Added support for chaining durations (such as 1 month + 1 day). Also fixed GenericYear handling of leap years - there were corner cases where it failed to work correctly - now fixed. No comments yet - will be in next commit. =============== Diff against Kernel-cbc.870 =============== Item was changed: ----- Method: DateAndTime>>+ (in category 'ansi protocol') ----- + + aDuration + "aDuration is one of: Duration, GenericDuration, GenericMonth, or GenericYear." + ^aDuration addToDateTime: self - + operand - "operand conforms to protocol Duration, or a Generic Month/Year" - ^operand addToDateTime: self ! Item was changed: ----- Method: DateAndTime>>- (in category 'ansi protocol') ----- - operand + "operand is one of: Duration, GenericDuration, GenericMonth, or GenericYear; or a DateAndTime or Timespan." + ^operand subtractFromDateTime: self - "operand conforms to protocol DateAndTime or protocol Duration" - - ^ (operand respondsTo: #asDateAndTime) - ifTrue: - [ | lticks rticks | - lticks := self asLocal ticks. - - rticks := operand asDateAndTime asLocal ticks. - Duration - seconds: (SecondsInDay *(lticks first - rticks first)) + - (lticks second - rticks second) - nanoSeconds: (lticks third - rticks third) ] - - ifFalse: - - [ self + (operand negated) ] ! Item was added: + ----- Method: DateAndTime>>addToDuration: (in category 'ansi protocol') ----- + addToDuration: aDuration + ^Duration nanoSeconds: (self asNanoSeconds + aDuration asNanoSeconds) + ! Item was added: + ----- Method: DateAndTime>>subtractFromDateTime: (in category 'ansi protocol') ----- + subtractFromDateTime: aDateAndTime + | lticks rticks | + lticks := aDateAndTime asLocal ticks. + rticks := self asLocal ticks. + ^Duration + seconds: (SecondsInDay * (lticks first - rticks first)) + + (lticks second - rticks second) + nanoSeconds: (lticks third - rticks third)! Item was added: + ----- Method: DateAndTime>>subtractFromDuration: (in category 'ansi protocol') ----- + subtractFromDuration: aDuration + ^Duration nanoSeconds: (aDuration asNanoSeconds - self asNanoSeconds)! Item was changed: ----- Method: Duration>>+ (in category 'ansi protocol') ----- + operand + "operand is a type of Duration" + ^operand addToDuration: self + ! - - "operand is a Duration" ^ self class nanoSeconds: (self asNanoSeconds + operand asNanoSeconds)! Item was changed: ----- Method: Duration>>- (in category 'ansi protocol') ----- - operand + "operand is a type of Duration" + ^operand subtractFromDuration: self + ! - "operand is a Duration" ^ self + operand negated! Item was added: + ----- Method: Duration>>addToDuration: (in category 'ansi protocol') ----- + addToDuration: aDuration + ^self class nanoSeconds: (self asNanoSeconds + aDuration asNanoSeconds) + ! Item was added: + ----- Method: Duration>>subtractFromDateTime: (in category 'ansi protocol') ----- + subtractFromDateTime: aDateAndTime + ^self copy negated addToDateTime: aDateAndTime! Item was added: + ----- Method: Duration>>subtractFromDuration: (in category 'ansi protocol') ----- + subtractFromDuration: aDuration + ^self class nanoSeconds: (aDuration asNanoSeconds - self asNanoSeconds) + ! Item was added: + Object subclass: #GenericDuration + instanceVariableNames: 'sequence' + classVariableNames: '' + poolDictionaries: '' + category: 'Kernel-Chronology'! Item was added: + ----- Method: GenericDuration>>+ (in category 'ansii protocol') ----- + + aDuration + "aDuration is one of the families of Duration. Not that if it isn't, it will fail, but only when addng to a DateAndTime or Timespan, not before!!" + aDuration class = self class + ifTrue: [sequence addAll: aDuration sequence] + ifFalse: [sequence addLast: { #+. #-. aDuration. }] + ! Item was added: + ----- Method: GenericDuration>>- (in category 'ansii protocol') ----- + - aDuration + "aDuration is one of the families of Duration. Not that if it isn't, it will fail, but only when addng to a DateAndTime or Timespan, not before!!" + aDuration class = self class + ifTrue: [sequence addAll: (aDuration sequence collect: [:s| s copy swap: 1 with: 2])] + ifFalse: [sequence addLast: { #-. #+. aDuration. }]! Item was added: + ----- Method: GenericDuration>>= (in category 'ansii protocol') ----- + = aGenericDuration + ^aGenericDuration hasSameSequence: sequence! Item was added: + ----- Method: GenericDuration>>addToDateTime: (in category 'ansii protocol') ----- + addToDateTime: aDateAndTime + ^sequence inject: aDateAndTime into: [:result :message| + result perform: message first with: message last + ]! Item was added: + ----- Method: GenericDuration>>addToDuration: (in category 'ansii protocol') ----- + addToDuration: aDuration + sequence addFirst: { #+. #-. aDuration. }! Item was added: + ----- Method: GenericDuration>>hasSameSequence: (in category 'ansii protocol') ----- + hasSameSequence: testSequence + ^sequence hasEqualElements: testSequence! Item was added: + ----- Method: GenericDuration>>initialize (in category 'initialize-release') ----- + initialize + sequence := OrderedCollection new.! Item was added: + ----- Method: GenericDuration>>printOn: (in category 'squeak protocol') ----- + printOn: stream + sequence do: [:msg| msg printOn: stream] separatedBy: [stream space]! Item was added: + ----- Method: GenericDuration>>sequence (in category 'accessing') ----- + sequence + + ^ sequence! Item was added: + ----- Method: GenericDuration>>subtractFromDateTime: (in category 'ansii protocol') ----- + subtractFromDateTime: aDateAndTime + ^sequence inject: aDateAndTime into: [:result :message| + result perform: message second with: message last + ]! Item was added: + ----- Method: GenericDuration>>subtractFromDuration: (in category 'ansii protocol') ----- + subtractFromDuration: aDuration + sequence do: [:s| s swap: 1 with: 2]. + sequence addFirst: { #+. #-. aDuration. }! Item was added: + ----- Method: GenericMonth>>+ (in category 'ansiProtocol') ----- + + aDuration + "aDuration is one of the families of Duration. Not that if it isn't, it will fail, but only when addng to a DateAndTime or Timespan, not before!!" + ^GenericDuration new + self + aDuration! Item was added: + ----- Method: GenericMonth>>- (in category 'ansiProtocol') ----- + - aDuration + "aDuration is one of the families of Duration. Not that if it isn't, it will fail, but only when addng to a DateAndTime or Timespan, not before!!" + ^GenericDuration new + self - aDuration! Item was added: + ----- Method: GenericMonth>>= (in category 'ansiProtocol') ----- + = aGenericMonth + ^aGenericMonth class = GenericMonth + and: [aGenericMonth number = number]! Item was added: + ----- Method: GenericMonth>>addToDuration: (in category 'ansiProtocol') ----- + addToDuration: aDuration + ^GenericDuration new + aDuration + self + ! Item was added: + ----- Method: GenericMonth>>printOn: (in category 'squeak protocol') ----- + printOn: stream + stream nextPutAll: number asString; nextPutAll: ' month'. + number abs = 1 ifFalse: [stream nextPut: $s].! Item was added: + ----- Method: GenericMonth>>subtractFromDateTime: (in category 'ansiProtocol') ----- + subtractFromDateTime: aDateAndTime + ^self copy negated addToDateTime: aDateAndTime + ! Item was added: + ----- Method: GenericMonth>>subtractFromDuration: (in category 'ansiProtocol') ----- + subtractFromDuration: aDuration + ^GenericDuration new + aDuration - self! Item was added: + ----- Method: GenericYear>>+ (in category 'ansiProtocol') ----- + + aDuration + "aDuration is one of the families of Duration. Not that if it isn't, it will fail, but only when addng to a DateAndTime or Timespan, not before!!" + ^GenericDuration new + self + aDuration! Item was added: + ----- Method: GenericYear>>- (in category 'ansiProtocol') ----- + - aDuration + "aDuration is one of the families of Duration. Not that if it isn't, it will fail, but only when addng to a DateAndTime or Timespan, not before!!" + ^GenericDuration new + self - aDuration! Item was added: + ----- Method: GenericYear>>= (in category 'ansiProtocol') ----- + = aGenericYear + ^aGenericYear class = GenericYear + and: [aGenericYear number = number]! Item was changed: ----- Method: GenericYear>>addToDateTime: (in category 'ansiProtocol') ----- addToDateTime: aDateAndTime | next | number < 0 ifTrue: [^self addNegativeToDateTime: aDateAndTime]. ^(1 to: number) inject: aDateAndTime into: [:end :mnth| + next := end + ((end isLeapYear and: [end month > 2]) + ifTrue: [end daysInYear - 1] "We've already factored in the extra leap year" + ifFalse: [end daysInYear] "either not a leap year, or we need the extra day" + ) days. + "if we are now in a leap year, we may need to already factor in the extra day" + (next month > 2 and: [next isLeapYear and: [end dayOfMonth ~= next dayOfMonth]]) ifTrue: [next := next + 1 days]. + "If we have leaped out of a leap year, and we were on Feb 29th, we need to back up to Feb 28th" + next month > end month ifTrue: [next := next - next dayOfMonth days]. - next := end + end daysInYear days. - next month = end month - ifFalse: [next := next - next dayOfMonth days]. next ]. ! Item was added: + ----- Method: GenericYear>>addToDuration: (in category 'ansiProtocol') ----- + addToDuration: aDuration + ^GenericDuration new + aDuration + self + ! Item was added: + ----- Method: GenericYear>>printOn: (in category 'squeak protocol') ----- + printOn: stream + stream nextPutAll: number asString; nextPutAll: ' year'. + number abs = 1 ifFalse: [stream nextPut: $s].! Item was added: + ----- Method: GenericYear>>subtractFromDateTime: (in category 'ansiProtocol') ----- + subtractFromDateTime: aDateAndTime + ^self copy negated addToDateTime: aDateAndTime! Item was added: + ----- Method: GenericYear>>subtractFromDuration: (in category 'ansiProtocol') ----- + subtractFromDuration: aDuration + ^GenericDuration new + aDuration - self! Item was added: + ----- Method: Time>>addToDuration: (in category 'ansi protocol') ----- + addToDuration: aDuration + ^Duration nanoSeconds: (self asNanoSeconds + aDuration asNanoSeconds) + ! Item was added: + ----- Method: Time>>subtractFromDuration: (in category 'ansi protocol') ----- + subtractFromDuration: aDuration + ^Duration nanoSeconds: (aDuration asNanoSeconds - self asNanoSeconds)! Item was changed: ----- Method: Timespan>>+ (in category 'ansi protocol') ----- + + aDuration + "aDuration is one of: Duration, GenericDuration, GenericMonth, or GenericYear." + ^self class starting: (aDuration addToDateTime: self start) duration: self duration + ! - + operand - "operand conforms to protocol Duration" - - - ^ self class starting: (self start + operand) duration: self duration! Item was changed: ----- Method: Timespan>>- (in category 'ansi protocol') ----- - operand + | result | + "operand is one of: Duration, GenericDuration, GenericMonth, or GenericYear; or a DateAndTime or Timespan." + result := operand subtractFromDateTime: self start. + ^result class = DateAndTime + ifTrue: [ self class starting: result duration: self duration] + ifFalse: [result] - "operand conforms to protocol DateAndTime or protocol Duration" - - ^ (operand respondsTo: #asDateAndTime) - - ifTrue: [ self start - operand ] - - ifFalse: [ self + (operand negated) ] ! Item was changed: ----- Method: Timespan>>addToDateTime: (in category 'squeak protocol') ----- addToDateTime: aDateAndTime + ^start addToDateTime: aDateAndTime - ^duration addToDateTime: aDateAndTime ! Item was added: + ----- Method: Timespan>>subtractFromDateTime: (in category 'squeak protocol') ----- + subtractFromDateTime: aDateAndTime + ^start subtractFromDateTime: aDateAndTime!

1 0

Re: [Pharo-dev] The Dilemma: Building a Futuristic GUI for Ephestos
by Eliot Miranda 19 Sep '14

19 Sep '14

On Sun, Sep 14, 2014 at 10:07 AM, Nicolai Hess <nicolaihess(a)web.de> wrote: > 2014-09-14 18:20 GMT+02:00 kilon alios <kilon.alios(a)gmail.com>: > >> Plenty ? no >> >> A few ? yes >> >> Woden is certainly a project that I want it to be successful and keep >> going forward but at the moment I can't say its usable when each time I >> resize the window it corrupts the viewport. >> >> No offense intended but lately the more I dive inside Pharo the more I >> feel I waste my time, I love the IDE and the environment and live coding >> but using the libraries is a never ending struggle for me. I agree with >> Nicolai the landscape is not good, Pharo really lacks mature libraries . >> Sure we like to bash Java but Java libs are rock solid and very well >> documented. I bring Java as example. Again I am not complaining at all, I >> knew when I came to Pharo that I will have to face these limitations. I >> also don't feel comfortable asking questions all the time as if I want >> others to do my code but I did not have much of a choice. I just cant deal >> with the lack of documentation any more. >> >> I think Pharo as a general idea is great , you definitely have taken the >> Squeak fork one big step further but you have a very long road ahead of you >> to make Pharo a modern environment. Asking for animating a window with good >> performance is one of the very basics of a good GUI API. I know you have >> limited resources and once again I am not complaining at all I just present >> my opinion. Its clear that Pharo needs a lot more people to contribute and >> bring the system forward at least to solve the basic problems. >> > > This is definitly wrong :) > Especially the older squeak versions were ahead of its time with > (animated) interactive UI elements. > Java (Swing) does not come with an animation framework for the UI (JavaFX, > yes but that took its time). > There was a timing/animation framework used by Roman Guy for its > FilthyRich clients, that did really look great. > He created UIs that never looked like ordinary Java UIs. But I think that > was done by few people only. > So, doing this for pharo should be doable. (I do remember something like > that was done for > Morphic (maybe this one: > https://www.hpi.uni-potsdam.de/hirschfeld/trac/SqueakCommunityProjects/wiki… > )) > > yoiu can do great thinks with Qt for C++ simple animation with the good > old qwidget and > the newer qml-framework. That's what I would call feature UIs (mostly what > is done nowadays on mobile devices and other > "platforms" have their own frameworks (java)android and Object-C (IPhone). > > And I think we will see more "feature"-UI on the web with > HTML5/Canvas/Web-GL. > > Do we need a good new UI framework for pharo? Yes. > Do we need many developers for working on this ? No, I think a handfull > (2-4) people would be enough. > What pharo really needs are: > Many more developers *using* pharo as a platform. > Agreed. But one real problem with the Squeak/Pharo UI is the lack of native windows. There is an old project Graphics-External-Ffenestri but AFAICT it isn't being used. But there /is/ a really good prototype of a native window system above Squeak done by Vassili Bykov in Newspeak. The native windows contain morphs, but anything, including MVC, can be present. This provides native Win32 Windows (doing other platforms is merely work) /and/ the ability to snapshot and bring back up windows on a different platform (e.g. open in win32, snapshot and bring up in Squeak/Pharo Morphic windows, or vice verse), and the ability to do this dynamically. Is anyone motivated to port the Newspeak code back to Squeak/Pharo? If you're interested, contact me, or Vassili, or Bob Westergaard and ask about Brazil (think plumbing). nicolai > > > > >> >> Thank you all people who helped me. But I don't think it worths to make >> my project in Pharo, too many problems. I feel privileged to have helped >> you with my contributions , I wish the Pharo the best. >> >> I could return back to Python but I think its time for me to bite the >> bullet and learn C/C++, since graphics is an area that deeply interest me >> (more as an artist less as a coder), so I don't have much of choice. Maybe >> I can brings some of my code back to Pharo with NB wrappers , I definitely >> will keep a close eye on Pharo. >> >> In a few months I will also present to the Pharo community a secret last >> contribution ;) >> >> On Sun, Sep 14, 2014 at 6:26 PM, phil(a)highoctane.be <phil(a)highoctane.be> >> wrote: >> >>> Do you know anything better for futuristic UIs at the moment? >>> >>> I guess that we aren't talking about commercial dev here. And if we >>> would rely on everything being documented in Pharo, errr, we wouldn't go >>> too far. >>> >>> That being said, there are plenty of examples in the Woden code. >>> >>> Phil >>> Le 14 sept. 2014 16:28, "Nicolai Hess" <nicolaihess(a)web.de> a écrit : >>> >>> Why should he use it, now? >>>> I mean, is there a stable API? Or a roadmap ? >>>> >>>> Sometimes it is a bit dangerous to trust on "bleeding edge" pharo >>>> frameworks. >>>> I did some work based on Roassal3D just to found out there won't be any >>>> further development. >>>> The same happens with Roassal and GraphET. >>>> The same can happen with Woden too :) >>>> >>>> >>>> >>>> >>>> >>>> 2014-09-14 14:13 GMT+02:00 phil(a)highoctane.be <phil(a)highoctane.be>: >>>> >>>>> Why not use Woden? >>>>> >>>>> Phil >>>>> Le 14 sept. 2014 12:51, "kilon alios" <kilon.alios(a)gmail.com> a >>>>> écrit : >>>>> >>>>> yeah I am afraid transparency is very important to me >>>>>> >>>>>> On Sun, Sep 14, 2014 at 1:34 PM, Nicolai Hess <nicolaihess(a)web.de> >>>>>> wrote: >>>>>> >>>>>>> 2014-09-14 11:32 GMT+02:00 stepharo <stepharo(a)free.fr>: >>>>>>> >>>>>>>> I remember that there was an animated gif support. >>>>>>>> Now I do not remember exactly. >>>>>>>> >>>>>>> >>>>>>> At least in squeak there is an AnimatedImageMorph, that can load and >>>>>>> display animated gifs. >>>>>>> That works and is quite fast even for multiple instances. But of >>>>>>> course no (alpha-)transparency >>>>>>> >>>>>>> >>>>>>> >>>>>>>> >>>>>>>> for roassal2 have a look at the viva classes: this is the animation >>>>>>>> frameworks that igor designed. >>>>>>>> >>>>>>>> Stef >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>> On 14/9/14 10:22, kilon alios wrote: >>>>>>>> >>>>>>>> so I tried to animate in Roassal having two different images >>>>>>>> display with a delay for few millisecond but it only displays the second >>>>>>>> image with this code >>>>>>>> >>>>>>>> form1 :=Form fromFileNamed:'/Users/kilon/Pictures/pharo.png'. >>>>>>>> form2 :=Form fromFileNamed:'/Users/kilon/Pictures/box.png'. >>>>>>>> v := RTView new. >>>>>>>> c := v canvas. >>>>>>>> s := TRBitmapShape new. >>>>>>>> s form: form1. >>>>>>>> c addShape: s. >>>>>>>> v open. >>>>>>>> >>>>>>>> (1 to: 100) do: [ :index| >>>>>>>> s form: form1. >>>>>>>> s signalUpdate . >>>>>>>> "(Delay forMilliseconds: 1000 ) wait." >>>>>>>> s form: form2. >>>>>>>> s signalUpdate . >>>>>>>> (Delay forMilliseconds: 1000) wait.]. >>>>>>>> >>>>>>>> I looked into RTAnimation but dont know how to use it for this >>>>>>>> example. Any help ? Does Roassal 2 support such animations ? >>>>>>>> >>>>>>>> if I do s form: and then s signalUpdate for each form separately >>>>>>>> it works fine but inside the loops does not seem to work , I tried bigger >>>>>>>> delays with no effect. >>>>>>>> >>>>>>>> On Sun, Sep 14, 2014 at 10:57 AM, stepharo <stepharo(a)free.fr> >>>>>>>> wrote: >>>>>>>> >>>>>>>>> Ronie when you ready I can help writting a chapter for the nex >>>>>>>>> book. >>>>>>>>> >>>>>>>>> Stef >>>>>>>>> >>>>>>>>> >>>>>>>>> On 13/9/14 21:42, Ronie Salgado wrote: >>>>>>>>> >>>>>>>>> Hello, >>>>>>>>> >>>>>>>>> On 13/9/14 20:11, Enrico Schwass wrote: >>>>>>>>>> >>>>>>>>>> Hi >>>>>>>>>> >>>>>>>>>> another option could be the verse protocol. There was a plugin >>>>>>>>>> for Maya and Blender to do realtime rendering. Dont know if there is some >>>>>>>>>> automatic Swig-like wrapper for smalltalk but FFI might work. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> There is Wig like wrapper for Pharo done by ronie salgado. >>>>>>>>>> >>>>>>>>> >>>>>>>>> I have an adapted version of Swig for Pharo NativeBoost here: >>>>>>>>> https://github.com/ronsaldo/swig >>>>>>>>> >>>>>>>>> Currently I am using it to generate my Bullet bindings >>>>>>>>> (available here: https://github.com/ronsaldo/bullet-pharo) that >>>>>>>>> can be used as an example of using Swig. >>>>>>>>> I still have to improve more my Swig generator, by writing >>>>>>>>> documentation and fixing some bugs. >>>>>>>>> >>>>>>>>> Greetings, >>>>>>>>> Ronie >>>>>>>>> >>>>>>>>> 2014-09-13 16:11 GMT-03:00 stepharo <stepharo(a)free.fr>: >>>>>>>>> >>>>>>>>>> >>>>>>>>>> On 13/9/14 20:11, Enrico Schwass wrote: >>>>>>>>>> >>>>>>>>>> Hi >>>>>>>>>> >>>>>>>>>> another option could be the verse protocol. There was a plugin >>>>>>>>>> for Maya and Blender to do realtime rendering. Dont know if there is some >>>>>>>>>> automatic Swig-like wrapper for smalltalk but FFI might work. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> There is Wig like wrapper for Pharo done by ronie salgado. >>>>>>>>>> >>>>>>>>>> Stef >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> http://youtu.be/c_D2YJSNj8I >>>>>>>>>> >>>>>>>>>> Almost a decade ago I did some ruby bindings by hand. It was >>>>>>>>>> working out of the box >>>>>>>>>> >>>>>>>>>> Bye >>>>>>>>>> Enno >>>>>>>>>> >>>>>>>>>> Am 13.09.2014 um 16:11 schrieb kilon alios <kilon.alios(a)gmail.com >>>>>>>>>> >: >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> " I am curious. You mean rendering Bitmap from blender, for later >>>>>>>>>> use in Pharo UI? " >>>>>>>>>> >>>>>>>>>> yes exactly. Blender can render in all popular graphics files, >>>>>>>>>> most used are png. Animation frames can be rendered each frame in its own >>>>>>>>>> file. >>>>>>>>>> >>>>>>>>>> So basically its a lot like the average games out there. >>>>>>>>>> >>>>>>>>>> "I will suggest bare bone Morphic mainly, then Athens when you >>>>>>>>>> need vectorial drawing." >>>>>>>>>> >>>>>>>>>> ok >>>>>>>>>> >>>>>>>>>> "For iStoa I decided to go purely Morphic, I have a lot of >>>>>>>>>> bitmap. Bitmap source is SVG, then converted to PNG, overscaled for >>>>>>>>>> production use. Then from iStoa, depending on the application window >>>>>>>>>> extent, the bitmap are downscaled accordingly, I am pretty satisfied by the >>>>>>>>>> result." >>>>>>>>>> >>>>>>>>>> I fail to understand how your bitmap source is SVG for me >>>>>>>>>> bitmap is a raster graphic format svg is procedural graphic format. Two >>>>>>>>>> opposite things. >>>>>>>>>> >>>>>>>>>> "Sure. The downpoint, you will depend on one additional layer." >>>>>>>>>> >>>>>>>>>> dependency is not an issue. Afterall the graphic files >>>>>>>>>> themselves will be far bigger download even more so if the GUI becomes very >>>>>>>>>> large. >>>>>>>>>> >>>>>>>>>> "Nice. What will be the expected outcomes of such API, I am >>>>>>>>>> not sure to understand and I am curious." >>>>>>>>>> >>>>>>>>>> Well Blender besides creating 3d objects (which can be used as >>>>>>>>>> 2d objects too) it can also create 3d unrendable objects. That means that >>>>>>>>>> objects produce no graphics and have the role of placeholders or helpers, >>>>>>>>>> for example when you want an emitter of light or emitter of a physical >>>>>>>>>> power like gravity or wind. Those are called dummy objects and I could use >>>>>>>>>> them to give characteristics to the graphics , for example I could use a >>>>>>>>>> dummy to define the are of influence of a mouse click , or what type of >>>>>>>>>> event the bitmap will respond to. That means you wont have to import the >>>>>>>>>> graphics manually to pharo and create a separate morph for each bitmap and >>>>>>>>>> then set the events but rather press a button in blender and then Ephestos >>>>>>>>>> will import then bitmaps to pharo , set the events and create the morphs >>>>>>>>>> automagically. >>>>>>>>>> >>>>>>>>>> So basically you will be using Blender as a GUI designer. >>>>>>>>>> >>>>>>>>>> "Use fuel to store the state of your application objects." >>>>>>>>>> >>>>>>>>>> ah nice so fuel is a good candidate. >>>>>>>>>> >>>>>>>>>> I will also take a look at Dr Geo and Phratch , both apps have >>>>>>>>>> custom GUIs and use only Morphic (Dr Geo using Athens for the geometry >>>>>>>>>> primitives) . >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> >>>>>> >>>> >> > -- best, Eliot

2 1

Daily Commit Log
by commits＠source.squeak.org 19 Sep '14

19 Sep '14

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2014-September/007275.… Name: Kernel-eem.871 Ancestors: Kernel-eem.870 Use prmitiveFailed, not primitiveFail (too much time in VM land). Also the accessor for the method header flag selecting bytecode set takes an Encoder instance, not an Encoder class. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2014-September/007276.… Name: Kernel-eem.872 Ancestors: Kernel-eem.871 Make skipBackBeforeJump bytecode-set agnostic. Fix a typo. stepToSendOrReturn doesn't need to use #| =============================================

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page: