Skip to content

GitLab

Commit 1f7bd4f3 authored by Dario Ocles's avatar Dario Ocles
Browse files

cambiando x por resolve

parent 91e929e8
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
05-PortfolioTreePrinter/PortfolioTreePrinter-Ejercicio.st
View file @ 1f7bd4f3
......@@ -574,6 +574,11 @@ numberOfDays
^numberOfDays ! !
!CertificateOfDeposit methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:39:50'!
resolve: methodAccount
^methodAccount fromCertificateOfDeposit: self! !
!CertificateOfDeposit methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 14:40:14'!
tna
......@@ -589,11 +594,6 @@ valueForBalance
^self value * -1! !
!CertificateOfDeposit methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 14:25:54'!
x: methodAccount
^methodAccount fromCertificateOfDeposit: self! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
!classDefinition: 'CertificateOfDeposit class' category: #'PortfolioTreePrinter-Ejercicio'!
......@@ -635,16 +635,16 @@ value
^ value! !
!Deposit methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:39:39'!
resolve: methodAccount
^methodAccount fromDeposit: self! !
!Deposit methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 15:21:38'!
valueForBalance
^self value! !
!Deposit methodsFor: 'as yet unclassified' stamp: 'ig 5/14/2018 18:51:31'!
x: methodAccount
^methodAccount fromDeposit: self! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
!classDefinition: 'Deposit class' category: #'PortfolioTreePrinter-Ejercicio'!
......@@ -686,6 +686,11 @@ initializeFor: aValue on: anAccount with: aTransfer
account := anAccount.
transfer := aTransfer.! !
!TransferDeposit methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:38:42'!
resolve: methodAccount
^methodAccount fromTransferDeposit: self! !
!TransferDeposit methodsFor: 'as yet unclassified' stamp: 'ig 5/10/2018 21:22:31'!
transfer
......@@ -701,11 +706,6 @@ valueForBalance
^self value! !
!TransferDeposit methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 14:13:29'!
x: methodAccount
^methodAccount fromTransferDeposit: self! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
!classDefinition: 'TransferDeposit class' category: #'PortfolioTreePrinter-Ejercicio'!
......@@ -747,6 +747,11 @@ initializeFor: aValue on: anAccount with: aTransfer
account := anAccount.
transfer := aTransfer.! !
!TransferWithdraw methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:38:29'!
resolve: methodAccount
^methodAccount fromTransferWithdraw: self! !
!TransferWithdraw methodsFor: 'as yet unclassified' stamp: 'ig 5/10/2018 21:22:35'!
transfer
......@@ -762,11 +767,6 @@ valueForBalance
^self value * -1! !
!TransferWithdraw methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 14:13:41'!
x: methodAccount
^methodAccount fromTransferWithdraw: self! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
!classDefinition: 'TransferWithdraw class' category: #'PortfolioTreePrinter-Ejercicio'!
......@@ -808,16 +808,16 @@ value
^ value ! !
!Withdraw methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:37:41'!
resolve: methodAccount
^methodAccount fromWithdraw: self! !
!Withdraw methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 15:21:33'!
valueForBalance
^self value * -1! !
!Withdraw methodsFor: 'as yet unclassified' stamp: 'ig 5/14/2018 19:12:29'!
x: methodAccount
^methodAccount fromWithdraw: self! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
!classDefinition: 'Withdraw class' category: #'PortfolioTreePrinter-Ejercicio'!
......@@ -877,10 +877,10 @@ initializeWith: someTransactions
transactions := someTransactions! !
!BalanceAccount methodsFor: 'as yet unclassified' stamp: 'ig 5/14/2018 19:26:03'!
!BalanceAccount methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:40:11'!
value
^ transactions inject: 0 into: [ :balance :transaction | balance + (transaction x: self) ].
^ transactions inject: 0 into: [ :balance :transaction | balance + (transaction resolve: self) ].
! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
......@@ -932,10 +932,10 @@ initializeWith: someTransactions
transactions := someTransactions! !
!InvestmentEarningsAccount methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 14:49:05'!
!InvestmentEarningsAccount methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:41:15'!
value
^ transactions inject: 0 into: [ :investment :transaction | investment + (transaction x: self) ].
^ transactions inject: 0 into: [ :investment :transaction | investment + (transaction resolve: self) ].
! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
......@@ -983,9 +983,9 @@ initializeWith: aPortfolio and: someNames
portfolio := aPortfolio.
names := someNames.! !
!NamingPortfolioTree methodsFor: 'as yet unclassified' stamp: 'dario 5/16/2018 21:17:11'!
!NamingPortfolioTree methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:41:27'!
value
^ portfolio x: self! !
^ portfolio resolve: self! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
......@@ -1036,10 +1036,10 @@ initializeWith: someTransactions
transactions := someTransactions! !
!NetInvestmentAccount methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 14:25:02'!
!NetInvestmentAccount methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:41:04'!
value
^ transactions inject: 0 into: [ :netInvestment :transaction | netInvestment + (transaction x: self) ].
^ transactions inject: 0 into: [ :netInvestment :transaction | netInvestment + (transaction resolve: self) ].
! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
......@@ -1091,10 +1091,10 @@ initializeWith: someTransactions
transactions := someTransactions! !
!NetTransferAccount methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 14:30:27'!
!NetTransferAccount methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:40:53'!
value
^ transactions inject: 0 into: [ :netTransfer :transaction | netTransfer + (transaction x: self) ].
^ transactions inject: 0 into: [ :netTransfer :transaction | netTransfer + (transaction resolve: self) ].
! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
......@@ -1212,8 +1212,8 @@ accounts
^accounts copy! !
!Portfolio methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 17:08:38'!
x: methodObject
!Portfolio methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:39:22'!
resolve: methodObject
^methodObject fromPortfolio: self! !
......@@ -1323,8 +1323,8 @@ registers: aTtransaction
! !
!ReceptiveAccount methodsFor: 'as yet unclassified' stamp: 'ig 5/15/2018 17:08:59'!
x: methodObject
!ReceptiveAccount methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:38:57'!
resolve: methodObject
^methodObject fromAccount: self! !
......@@ -1366,11 +1366,11 @@ initializeWith: someTransactions
transactions := someTransactions.! !
!SummaryAccount methodsFor: 'as yet unclassified' stamp: 'ig 5/14/2018 19:24:47'!
!SummaryAccount methodsFor: 'as yet unclassified' stamp: 'dario 5/17/2018 15:40:41'!
value
^transactions inject: OrderedCollection new
into: [ :summary :transaction | summary add: (transaction x: self). summary ]! !
into: [ :summary :transaction | summary add: (transaction resolve: self). summary ]! !
"-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- "!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment