Author: jm
Date: 2012-06-13 11:03:34 -0700 (Wed, 13 Jun 2012)
New Revision: 29549
Modified:
core3/api/trunk/equations-api/src/main/java/org/cytoscape/equations/FunctionUtil.java
core3/api/trunk/equations-api/src/test/java/org/cytoscape/equations/FunctionUtilTest.java
Log:
Fixed issues with FunctionUtil.getOrdinal which used to return "12nd" and
"13rd" instead of "12th" and "13th"
Modified:
core3/api/trunk/equations-api/src/main/java/org/cytoscape/equations/FunctionUtil.java
===================================================================
---
core3/api/trunk/equations-api/src/main/java/org/cytoscape/equations/FunctionUtil.java
2012-06-13 09:32:18 UTC (rev 29548)
+++
core3/api/trunk/equations-api/src/main/java/org/cytoscape/equations/FunctionUtil.java
2012-06-13 18:03:34 UTC (rev 29549)
@@ -198,9 +198,13 @@
* @return the String representation of the ith ordinal
*/
public static String getOrdinal(final int i) {
- if ((i % 100) == 11)
+ switch (i % 100) {
+ case 11:
+ case 12:
+ case 13:
return Integer.toString(i) + "th";
-
+ }
+
switch (i % 10) {
case 1:
return Integer.toString(i) + "st";
Modified:
core3/api/trunk/equations-api/src/test/java/org/cytoscape/equations/FunctionUtilTest.java
===================================================================
---
core3/api/trunk/equations-api/src/test/java/org/cytoscape/equations/FunctionUtilTest.java
2012-06-13 09:32:18 UTC (rev 29548)
+++
core3/api/trunk/equations-api/src/test/java/org/cytoscape/equations/FunctionUtilTest.java
2012-06-13 18:03:34 UTC (rev 29549)
@@ -184,6 +184,16 @@
}
@Test
+ public void testGetOrdinal6() {
+ assertEquals("getOrdinal() failed!", "12th",
FunctionUtil.getOrdinal(12));
+ }
+
+ @Test
+ public void testGetOrdinal7() {
+ assertEquals("getOrdinal() failed!", "13th",
FunctionUtil.getOrdinal(13));
+ }
+
+ @Test
public void testCalcSampleVariance() {
final double[] x = { 2.2, 2.2 };
assertEquals("calcSampleVariance() failed!", 0.0,
FunctionUtil.calcSampleVariance(x), 0.0001);
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
