From 8467749e196c085c9fa75bdfb793e96b6a3bb458 Mon Sep 17 00:00:00 2001
From: Winnie <liang15@mcmaster.ca>
Date: Wed, 7 Mar 2018 15:46:13 -0500
Subject: [PATCH] - Improve variable naming
---
src/biotree/Record.java | 8 ++++----
src/biotree/TaxonNode.java | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/biotree/Record.java b/src/biotree/Record.java
index 3d6b5f0..b17037b 100644
--- a/src/biotree/Record.java
+++ b/src/biotree/Record.java
@@ -4,7 +4,7 @@ public class Record {
private final int eventId;
private final String occurId;
private final int taxonId;
- private final int count;
+ private final int individualCount;
private final float latitude;
private final float longitude;
@@ -17,11 +17,11 @@ public class Record {
/**
* Initialize Record abstract object
*/
- public Record( int eventId, String occurId, int taxonId, int count, float latitude, float longitude, String locality, int depth , int year, int month, int day, int hour, int minute ) {
+ public Record( int eventId, String occurId, int taxonId, int individualCount, float latitude, float longitude, int year, int month, int day) {
this.eventId = eventId;
this.occurId = occurId;
this.taxonId = taxonId;
- this.count = count;
+ this.individualCount = individualCount;
this.latitude = latitude;
this.longitude = longitude;
@@ -62,7 +62,7 @@ public class Record {
* @return The individual count of the record
*/
public int getCount() {
- return count;
+ return individualCount;
}
/**
* Gets latitude of the record
diff --git a/src/biotree/TaxonNode.java b/src/biotree/TaxonNode.java
index 438711f..1007d25 100644
--- a/src/biotree/TaxonNode.java
+++ b/src/biotree/TaxonNode.java
@@ -18,7 +18,7 @@ public class TaxonNode {
private TaxonNode parent;
private ArrayList<TaxonNode> children = new ArrayList<TaxonNode>();
- private int count;
+ private int childrenCount;
/**
@@ -34,7 +34,7 @@ public class TaxonNode {
this.name = name;
this.parent = null;
this.children = new ArrayList<TaxonNode>();
- this.count = 0;
+ this.childrenCount = 0;
}
/**
@@ -89,7 +89,7 @@ public class TaxonNode {
* @return Children Count
*/
public int getCount() {
- return this.count;
+ return this.childrenCount;
}
@@ -115,7 +115,7 @@ public class TaxonNode {
* Increments the children count
*/
public void incCount() {
- this.count ++;
+ this.childrenCount ++;
}
/**
@@ -134,7 +134,7 @@ public class TaxonNode {
s += String.format("%d ", tx.getTaxonId());
}
s += "\n";
- s += String.format("%-20s%d\n", "Count:", count);
+ s += String.format("%-20s%d\n", "Count:", childrenCount);
return s;
}
}
--
GitLab