projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Store common frequencies in library version-independent form
[fw/altos]
/
altoslib
/
AltosFrequency.java
diff --git
a/altoslib/AltosFrequency.java
b/altoslib/AltosFrequency.java
index 7c6ffe61d5120ac05041316d13978604922817e8..88997152982f6e5876539144372ca9e3e680e1ed 100644
(file)
--- a/
altoslib/AltosFrequency.java
+++ b/
altoslib/AltosFrequency.java
@@
-15,9
+15,13
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
9
;
+package org.altusmetrum.altoslib_
11
;
-public class AltosFrequency {
+import java.io.*;
+import java.util.*;
+import java.text.*;
+
+public class AltosFrequency implements Serializable {
public double frequency;
public String description;
public double frequency;
public String description;
@@
-44,14
+48,31
@@
public class AltosFrequency {
frequency, description);
}
frequency, description);
}
+ public String frequency_string() {
+ return String.format("%7.3f", frequency);
+ }
+
public boolean close(double f) {
double diff = Math.abs(frequency - f);
return diff < 0.010;
}
public boolean close(double f) {
double diff = Math.abs(frequency - f);
return diff < 0.010;
}
+ public AltosHashSet hashSet() {
+ AltosHashSet h = new AltosHashSet();
+
+ h.putDouble("frequency", frequency);
+ h.putString("description", description);
+ return h;
+ }
+
public AltosFrequency(double f, String d) {
frequency = f;
description = d;
}
public AltosFrequency(double f, String d) {
frequency = f;
description = d;
}
+
+ public AltosFrequency(AltosHashSet h) {
+ frequency = h.getDouble("frequency", 0.0);
+ description = h.getString("description", "");
+ }
}
}