-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Double Entry Accounting #4
Open
rafabap
wants to merge
8
commits into
INET-Complexity:master
Choose a base branch
from
rafabap:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
aa2ab65
Added accounting files
rafabap c3b561b
One account <=> One Contract Type
rafabap 2ac4b8b
Delete Ledger.java
rafabap a8299c2
Delete Collateral.java
rafabap e78734e
Private debit/credit, created doubleEntry function
rafabap a4119a2
Implemented changes from code review
rafabap cb9c049
Deleted Book
rafabap d225f11
Deleted BookAPI
rafabap File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
package accounting; | ||
|
||
import agents.Agent; | ||
import actions.Action; | ||
import contracts.Contract; | ||
|
||
import java.util.ArrayList; | ||
import java.util.HashSet; | ||
|
||
class Account { | ||
|
||
private Account(String name, AccountType accountType, Double startingBalance) { | ||
this.name = name; | ||
this.accountType = accountType; | ||
this.balance = startingBalance; | ||
} | ||
|
||
Account(String name, AccountType accountType) { | ||
this(name,accountType,0.0); | ||
} | ||
|
||
private double balance; | ||
|
||
static void doubleEntry(Account debitAccount, Account creditAccount, double amount) { | ||
debitAccount.debit(amount); | ||
creditAccount.credit(amount); | ||
} | ||
|
||
// private Collateral collateralType; | ||
private AccountType accountType; | ||
private String name; | ||
|
||
|
||
/** | ||
* A Debit is a positive change for ASSET and EXPENSES accounts, and negative for the rest. | ||
* @param amount the amount to debit | ||
*/ | ||
private void debit(double amount) { | ||
if ((accountType==AccountType.ASSET) || (accountType==AccountType.EXPENSES)) { | ||
balance += amount; | ||
} else { | ||
balance -= amount; | ||
} | ||
} | ||
|
||
/** | ||
* A Credit is a negative change for ASSET and EXPENSES accounts, and positive for the rest. | ||
* @param amount the amount to credit | ||
*/ | ||
private void credit(double amount) { | ||
if ((accountType==AccountType.ASSET) || (accountType==AccountType.EXPENSES)) { | ||
balance -= amount; | ||
} else { | ||
balance += amount; | ||
} | ||
} | ||
|
||
AccountType getAccountType() { | ||
return accountType; | ||
} | ||
|
||
double getBalance() { | ||
return balance; | ||
} | ||
|
||
String getName() { | ||
return name; | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should the user be able to pull a list of the existing contracts in the contract hashSet? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
package accounting; | ||
|
||
public enum AccountType { | ||
ASSET, | ||
LIABILITY, | ||
EQUITY, | ||
INCOME, | ||
EXPENSES | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should there be a removeContract functionality?