diff --git a/.gitignore b/.gitignore
index 05a7cda5b80ecf76985f7fe96801e9b969eed44b..496ee2ca6a2f08396a4076fe43dedf3dc0da8b6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-build
-cobertura.ser
-dist
-instrumented
.DS_Store
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
index 0e0a1a28d724d254c2318c296c98c123e87adab8..77620d32ea791e385f2bf4ed3718c21cff0708db 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -3,26 +3,3 @@ contains materials that originally came from the United States Geological
Survey, an agency of the United States Department of Interior. For more
information, see the official USGS copyright policy at
http://www.usgs.gov/visual-id/credit_usgs.html#copyright
-
-
-Dependent libraries found in the "lib" directory are distributed under the
-open source (or open source-like) licenses/agreements. Appropriate license
-aggrements for each library can be found in the "lib" directory.
-
-Libraries used at runtime
--------------------------
-
-- JLargeArrays-1.2.jar (https://github.com/IcmVis/JLargeArrays)
-- JTransforms-3.0.jar (https://github.com/wendykierp/JTransforms)
-
-Libraries used to build/test package
-------------------------------------
-
- - asm-4.1.jar (http://asm.ow2.org/index.html)
- - asm-commons-4.1.jar (http://asm.ow2.org/index.html)
- - asm-tree-4.1.jar (http://asm.ow2.org/index.html)
- - cobertura.jar (http://cobertura.sourceforge.net/)
- - hamcrest-core-1.3.jar (https://code.google.com/p/hamcrest/)
- - jakarta-oro-2.0.8.jar (http://jakarta.apache.org/oro/)
- - junit-4.11.jar (http://junit.org/)
- - log4j-1.2.9.jar (http://logging.apache.org/log4j/2.x/)
diff --git a/build.xml b/build.xml
deleted file mode 100755
index c04d7314dd8c83477f6e43fb27be4fa7df54dea0..0000000000000000000000000000000000000000
--- a/build.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Geomag Algorithms" default="jar" basedir=".">
-
- <description>
- Geomag algorithms includes tools to fetch, process, and output geomag data.
- </description>
-
-
- <!-- PROJECT PROPERTIES -->
- <property name="etc" location="etc" />
- <property name="src" location="src/java" />
- <property name="lib" location="lib" />
-
- <property name="build" location="build" />
- <property name="dist" location="dist" />
-
- <property name="instrumented.dir" location="instrumented" />
- <property name="reports.dir" location="${dist}/reports" />
- <property name="reports.xml.dir" location="${reports.dir}/junit-xml" />
- <property name="reports.html.dir" location="${reports.dir}/junit-html" />
- <property name="coverage.xml.dir" location="${reports.dir}/coverage-xml" />
- <property name="coverage.html.dir" location="${reports.dir}/coverage-html" />
-
- <property name="compile.debug" value="true" />
-
-
- <!-- CLASSPATH -->
- <fileset dir="${lib}" id="classpath.fileset">
- <include name="JLargeArrays-1.2.jar" />
- <include name="JTransforms-3.0.jar" />
- </fileset>
-
- <path id="classpath">
- <fileset refid="classpath.fileset" />
- </path>
-
- <path id="classpath-test">
- <path refid="classpath" />
- <pathelement path="${build}" />
- <pathelement location="${lib}/junit-4.11.jar" />
- </path>
-
- <path id="classpath-cobertura">
- <pathelement location="${lib}/cobertura.jar" />
- <pathelement location="${lib}/asm-4.1.jar" />
- <pathelement location="${lib}/asm-commons-4.1.jar" />
- <pathelement location="${lib}/asm-tree-4.1.jar" />
- <pathelement location="${lib}/hamcrest-core-1.3.jar" />
- <pathelement location="${lib}/jakarta-oro-2.0.8.jar" />
- <pathelement location="${lib}/log4j-1.2.9.jar" />
- </path>
-
- <taskdef classpathref="classpath-cobertura" resource="tasks.properties" />
-
-
- <!-- TARGETS -->
- <target name="compile" description="Compile code">
- <mkdir dir="${build}" />
-
- <javac srcdir="${src}" destdir="${build}" source="1.6" target="1.6" includeAntRuntime="no" debug="${compile.debug}">
- <classpath refid="classpath-test" />
- </javac>
- </target>
-
- <target name="instrument" depends="compile" description="Cobertura intrumentation for coverage.">
- <delete file="cobertura.ser" />
- <delete dir="${instrumented.dir}" />
-
- <cobertura-instrument todir="${instrumented.dir}">
- <!--
- The following line causes instrument to ignore any
- source line containing a reference to log4j, for the
- purposes of coverage reporting.
- -->
- <ignore regex="org.apache.log4j.*" />
-
- <fileset dir="${build}">
- <!--
- Instrument all the application classes, but
- don't instrument the test classes.
- -->
- <include name="**/*.class" />
- <exclude name="**/*Test.class" />
- <exclude name="**/*Test$*.class"/>
- </fileset>
- </cobertura-instrument>
- </target>
-
- <target name="test" depends="compile, instrument" description="Run JUnit tests">
- <mkdir dir="${reports.xml.dir}" />
- <mkdir dir="${reports.html.dir}" />
-
- <junit fork="yes" printsummary="yes" haltonfailure="yes" failureProperty="test.failed">
- <classpath location="${instrumented.dir}" />
- <classpath refid="classpath-test" />
- <classpath refid="classpath-cobertura" />
-
- <formatter type="xml" />
- <formatter type="plain" usefile="false" />
-
- <batchtest todir="${reports.xml.dir}">
- <!-- any class with the name Test in its name -->
- <fileset dir="${src}" includes="**/*Test.java" />
- </batchtest>
- </junit>
-
- <junitreport todir="${reports.xml.dir}">
- <fileset dir="${reports.xml.dir}">
- <include name="TEST-*.xml" />
- </fileset>
- <report format="frames" todir="${reports.html.dir}" />
- </junitreport>
- </target>
-
-
- <target name="coverage" depends="test" description="Run Coverage tests">
- <mkdir dir="${coverage.xml.dir}" />
- <mkdir dir="${coverage.html.dir}" />
-
- <!-->
- <cobertura-check branchrate="34" totallinerate="100"/>-->
- <cobertura-report srcdir="${src}" destdir="${coverage.xml.dir}" format="xml" />
- <cobertura-report destdir="${coverage.html.dir}">
- <fileset dir="${src}">
- <include name="**/*.java" />
- </fileset>
- </cobertura-report>
- </target>
-
- <target name="jar" depends="compile" description="Build jar">
- <mkdir dir="${dist}" />
-
- <!-- Build the jar file -->
- <jar jarfile="${dist}/GeomagAlgorithms.jar" basedir="${build}" excludes="**/*Test*">
- <manifest>
- <attribute name="Main-Class" value="gov.usgs.geomag.io.WaveserverMain" />
- </manifest>
- <zipgroupfileset refid="classpath.fileset" />
- </jar>
- </target>
-
- <target name="javadoc" depends="jar" description="Run JavaDoc">
- <javadoc destdir="${dist}/javadoc" packagenames="gov.usgs.*">
- <fileset dir="${src}" excludes="**/*Test*" />
- <classpath refid="classpath" />
- </javadoc>
- </target>
-
- <target name="all" depends="clean,test,coverage,jar,javadoc" description="clean, test, jar, and javadoc" />
-
- <target name="clean" description="Delete build and dist directories">
- <delete dir="${build}" />
- <delete dir="${dist}" />
- <delete dir="${instrumented.dir}" />
- <delete file="cobertura.log" />
- <delete file="cobertura.ser" />
- <delete dir="bin" />
- </target>
-
-</project>
diff --git a/lib/JLargeArrays-1.2-license.txt b/lib/JLargeArrays-1.2-license.txt
deleted file mode 100644
index 304e724556984c6c255232fae1a707f08018b33a..0000000000000000000000000000000000000000
--- a/lib/JLargeArrays-1.2-license.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-JLargeArrays
-Copyright (C) 2013 onward University of Warsaw, ICM
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/JLargeArrays-1.2.jar b/lib/JLargeArrays-1.2.jar
deleted file mode 100644
index 7be7a5da51681769e4a8b8774d49060a32dcb8af..0000000000000000000000000000000000000000
Binary files a/lib/JLargeArrays-1.2.jar and /dev/null differ
diff --git a/lib/JTransforms-3.0-license.txt b/lib/JTransforms-3.0-license.txt
deleted file mode 100644
index 2f0589f76da7d2332d30bb44186cc9a1b9fc1c07..0000000000000000000000000000000000000000
--- a/lib/JTransforms-3.0-license.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-JTransforms
-Copyright (c) 2007 onward, Piotr Wendykier
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/JTransforms-3.0.jar b/lib/JTransforms-3.0.jar
deleted file mode 100644
index 9cc2e3f34c9f9ae8e055d7e98ba0237c77ef10aa..0000000000000000000000000000000000000000
Binary files a/lib/JTransforms-3.0.jar and /dev/null differ
diff --git a/lib/asm-4.1-license.txt b/lib/asm-4.1-license.txt
deleted file mode 100644
index 7676ba542dfe55bff6ff50edb9ed620da8c994bd..0000000000000000000000000000000000000000
--- a/lib/asm-4.1-license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/asm-4.1.jar b/lib/asm-4.1.jar
deleted file mode 100644
index 4ede5c99af40a09d9c477e611ccca64e8735cbf0..0000000000000000000000000000000000000000
Binary files a/lib/asm-4.1.jar and /dev/null differ
diff --git a/lib/asm-commons-4.1-license.txt b/lib/asm-commons-4.1-license.txt
deleted file mode 100644
index 7676ba542dfe55bff6ff50edb9ed620da8c994bd..0000000000000000000000000000000000000000
--- a/lib/asm-commons-4.1-license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/asm-commons-4.1.jar b/lib/asm-commons-4.1.jar
deleted file mode 100644
index 6d95f2cd84021b261b242fb101bce3b52a93bd90..0000000000000000000000000000000000000000
Binary files a/lib/asm-commons-4.1.jar and /dev/null differ
diff --git a/lib/asm-tree-4.1-license.txt b/lib/asm-tree-4.1-license.txt
deleted file mode 100644
index 7676ba542dfe55bff6ff50edb9ed620da8c994bd..0000000000000000000000000000000000000000
--- a/lib/asm-tree-4.1-license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2000-2011 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/asm-tree-4.1.jar b/lib/asm-tree-4.1.jar
deleted file mode 100644
index 9383d994d21a834b931f1ebd3aa642adf8060711..0000000000000000000000000000000000000000
Binary files a/lib/asm-tree-4.1.jar and /dev/null differ
diff --git a/lib/cobertura-license.txt b/lib/cobertura-license.txt
deleted file mode 100644
index d1e7652d9e773cc76e7ac7c7e16d3e6e1632d436..0000000000000000000000000000000000000000
--- a/lib/cobertura-license.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-The Cobertura ant tasks are licensed under the [Apache Software License,
-Version 1.1] [1]. The rest of Cobertura is licensed under the [GNU General
-Public License, Version 2.0] [2]. See below for [detailed explanations] [3]
-
-[1]: http://perl.apache.org/start/LICENSE.txt
-[2]: http://www.gnu.org/licenses/gpl-2.0.html
-[3]: http://cobertura.sourceforge.net/license.html
\ No newline at end of file
diff --git a/lib/cobertura.jar b/lib/cobertura.jar
deleted file mode 100644
index cddddb18e718fec00e9402bd94c28c9982eb22fe..0000000000000000000000000000000000000000
Binary files a/lib/cobertura.jar and /dev/null differ
diff --git a/lib/hamcrest-core-1.3-license.txt b/lib/hamcrest-core-1.3-license.txt
deleted file mode 100644
index 027356c331b2ce9e6503e5871fd86ff70550c2b9..0000000000000000000000000000000000000000
--- a/lib/hamcrest-core-1.3-license.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-BSD License
-
-Copyright (c) 2000-2006, www.hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer. Redistributions in binary form
-must reproduce the above copyright notice, this list of conditions and the
-following disclaimer in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to
-endorse or promote products derived from this software without specific prior
-written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16e3dd37ebe79a36f61f5d0e1a69a653a8a..0000000000000000000000000000000000000000
Binary files a/lib/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/lib/jakarta-oro-2.0.8-license.txt b/lib/jakarta-oro-2.0.8-license.txt
deleted file mode 100644
index f571b1b6daae887eb1b50b937b0a6f81606e9b48..0000000000000000000000000000000000000000
--- a/lib/jakarta-oro-2.0.8-license.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation. All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation", "Jakarta-Oro"
- * must not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- * or "Jakarta-Oro", nor may "Apache" or "Jakarta-Oro" appear in their
- * name, without prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
diff --git a/lib/jakarta-oro-2.0.8.jar b/lib/jakarta-oro-2.0.8.jar
deleted file mode 100644
index 23488d2600f5f4784c0ba2be5baa4c41f396f616..0000000000000000000000000000000000000000
Binary files a/lib/jakarta-oro-2.0.8.jar and /dev/null differ
diff --git a/lib/junit-4.11-license.txt b/lib/junit-4.11-license.txt
deleted file mode 100644
index cb22fdc20279073f0deea7c0b97ddd261b21be08..0000000000000000000000000000000000000000
--- a/lib/junit-4.11-license.txt
+++ /dev/null
@@ -1,213 +0,0 @@
-JUnit
-
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
- documentation distributed under this Agreement, and
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are
-not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and
-such derivative works, in source code and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under
-Licensed Patents to make, use, sell, offer to sell, import and otherwise
-transfer the Contribution of such Contributor, if any, in source code and
-object code form. This patent license shall apply to the combination of the
-Contribution and the Program if, at the time the Contribution is added by the
-Contributor, such addition of the Contribution causes such combination to be
-covered by the Licensed Patents. The patent license shall not apply to any
-other combinations which include the Contribution. No hardware per se is
-licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the
-licenses to its Contributions set forth herein, no assurances are provided by
-any Contributor that the Program does not infringe the patent or other
-intellectual property rights of any other entity. Each Contributor disclaims
-any liability to Recipient for claims brought by any other entity based on
-infringement of intellectual property rights or otherwise. As a condition to
-exercising the rights and licenses granted hereunder, each Recipient hereby
-assumes sole responsibility to secure any other intellectual property rights
-needed, if any. For example, if a third party patent license is required to
-allow Recipient to distribute the Program, it is Recipient's responsibility to
-acquire that license before distributing the Program.
-
- d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license
-set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement are
-offered by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on
-or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the
-Program.
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using
-and distributing the Program and assumes all risks associated with its exercise
-of rights under this Agreement, including but not limited to the risks and
-costs of program errors, compliance with applicable laws, damage to or loss of
-data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging that the
-Program itself (excluding combinations of the Program with other software or
-hardware) infringes such Recipient's patent(s), then such Recipient's rights
-granted under Section 2(b) shall terminate as of the date such litigation is
-filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue
-and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial
-in any resulting litigation.
\ No newline at end of file
diff --git a/lib/junit-4.11.jar b/lib/junit-4.11.jar
deleted file mode 100644
index aaf74448492932e95902b40a70c7a4da5bad4744..0000000000000000000000000000000000000000
Binary files a/lib/junit-4.11.jar and /dev/null differ
diff --git a/lib/log4j-1.2.9-license.txt b/lib/log4j-1.2.9-license.txt
deleted file mode 100644
index 98a324cf06e7e07312b87d1dab282ed17b0bb33d..0000000000000000000000000000000000000000
--- a/lib/log4j-1.2.9-license.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright 1999-2005 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
diff --git a/lib/log4j-1.2.9.jar b/lib/log4j-1.2.9.jar
deleted file mode 100644
index a6568b01a2179f5b20473a1dcee4c67da062b327..0000000000000000000000000000000000000000
Binary files a/lib/log4j-1.2.9.jar and /dev/null differ
diff --git a/src/java/gov/usgs/geomag/io/Timeseries.java b/src/java/gov/usgs/geomag/io/Timeseries.java
deleted file mode 100644
index 8eb9394c3cd5dc68d513d3f6bb86ac7afa2cc80a..0000000000000000000000000000000000000000
--- a/src/java/gov/usgs/geomag/io/Timeseries.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package gov.usgs.geomag.io;
-
-import java.math.BigDecimal;
-import java.math.MathContext;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-
-/**
- * Base class for Timeseries.
- *
- * A timeseries represents a sequence of samples collected at
- * regular intervals.
- */
-public class Timeseries {
-
- public static final BigDecimal RATE_SECOND = BigDecimal.ONE;
- public static final BigDecimal RATE_MINUTE = BigDecimal.ONE.divide(
- new BigDecimal("60"), MathContext.DECIMAL128);
-
- /** The time of the first sample. */
- private final Date starttime;
- /** The time of the last sample. */
- private final Date endtime;
- /** The samples. */
- private final ArrayList<BigDecimal> samples;
- /** The sample interval. */
- private final BigDecimal sampleRate;
-
- /**
- * Construct a timeseries object.
- *
- * @param channel the channel.
- * @param starttime the starttime.
- * @param endtime the endtime.
- */
- public Timeseries (final Date starttime, final Date endtime,
- final ArrayList<BigDecimal> samples) {
- this(starttime, endtime, samples,
- computeSampleRate(samples.size(), starttime, endtime));
- }
-
- /**
- * Construct a timeseries object.
- *
- * @param starttime time of the first sample.
- * @param endtime time of the last sample.
- * @param samples the samples.
- * @param sampleRate the sample rate in hertz.
- */
- public Timeseries (final Date starttime, final Date endtime,
- final ArrayList<BigDecimal> samples, final BigDecimal sampleRate) {
- this.starttime = starttime;
- this.endtime = endtime;
- this.samples = samples;
- this.sampleRate = sampleRate;
- }
-
- /**
- * @return the time of the first sample.
- */
- public Date getStartTime () {
- return this.starttime;
- }
-
- /**
- * @return the time of the last sample.
- */
- public Date getEndTime () {
- return this.endtime;
- }
-
- /**
- * @return the samples.
- */
- public ArrayList<BigDecimal> getSamples () {
- return this.samples;
- }
-
- /**
- * @return the sample rate in Hertz.
- */
- public BigDecimal getSampleRate () {
- return this.sampleRate;
- }
-
-
- /**
- * Get the time for a given sample index.
- */
- public Date getSampleTime (final int index) {
- if (index < 0 || index >= getSamples().size()) {
- // out of range
- return null;
- }
- return computeSampleTime(index, getStartTime(), getSampleRate());
- }
-
- /**
- * Compute the index for a given time.
- *
- * @param time the sample time.
- * @return getSampleIndex(time, true).
- */
- public Integer getSampleIndex (final Date time) {
- return getSampleIndex(time, true);
- }
-
- /**
- * Get the index of a given time.
- *
- * @param time the sample time.
- * @param exact whether to (true) return null if no sample exists for time,
- * or (false) to return the nearest index for time.
- * @return index for given time, null if out of timeseries range.
- */
- public Integer getSampleIndex (final Date time, final boolean exact) {
- if (time.before(getStartTime()) || time.after(getEndTime())) {
- // out of range
- return null;
- }
- int index = computeSampleIndex(time, getStartTime(), getSampleRate());
- if (exact) {
- Date expected = getSampleTime(index);
- if (!time.equals(expected)) {
- // no sample at exactly time
- return null;
- }
- }
- return index;
- }
-
- /**
- * Compute the time of an index.
- *
- * @param index the sample index (zero based).
- * @param starttime the time of the first sample.
- * @param sampleRate the sample rate in hertz.
- * @return the time of the sample.
- */
- public static final Date computeSampleTime (final int index,
- final Date starttime, final BigDecimal rate) {
- long offset = (long) (index * 1000.0 / rate.doubleValue());
- return new Date(starttime.getTime() + offset);
- }
-
- /**
- * Compute the index of a time.
- *
- * @param time the time to compute index of.
- * @param starttime the time of the first sample.
- * @param rate the sample rate in hertz.
- * @return the index of the sample nearest to time.
- */
- public static final int computeSampleIndex (final Date time,
- final Date starttime, final BigDecimal rate) {
- long offset = time.getTime() - starttime.getTime();
- return (int) Math.round(offset * rate.doubleValue() / 1000.0);
- }
-
- /**
- * Compute the sample rate.
- *
- * @param count the number of samples (one based).
- * @param starttime the time of the first sample.
- * @param endtime the time of the last sample.
- * @return the sample rate in Hertz.
- */
- public static final BigDecimal computeSampleRate (final int count,
- final Date starttime, final Date endtime) {
- long milliseconds = endtime.getTime() - starttime.getTime();
- BigDecimal seconds = new BigDecimal(milliseconds).movePointLeft(3);
- return new BigDecimal(count - 1).divide(seconds, MathContext.DECIMAL128);
- }
-
- /**
- * Merge values from multiple timeseries.
- *
- * The first non-null value found for each sample is the merged value.
- *
- * @param sources sources to merge in most-preferred-first order.
- * @return merged timeseries
- */
- public static final Timeseries merge (final Timeseries[] sources) {
- int numSources = sources.length;
- int numSamples = sources[0].getSamples().size();
- ArrayList<BigDecimal> merged = new ArrayList<BigDecimal>(numSamples);
- BigDecimal value;
- for (int index = 0; index < numSamples; index++) {
- value = null;
- for (int source = 0; source < numSources; source++) {
- value = sources[source].getSamples().get(index);
- if (value != null) {
- // first non-null value for this index
- break;
- }
- }
- merged.add(value);
- }
- return new Timeseries(sources[0].getStartTime(), sources[0].getEndTime(),
- merged, sources[0].getSampleRate());
- }
-
-}
diff --git a/src/java/gov/usgs/geomag/io/TimeseriesFactory.java b/src/java/gov/usgs/geomag/io/TimeseriesFactory.java
deleted file mode 100644
index ea5fa14e4400a90d03836be633a32ff4b64d8df7..0000000000000000000000000000000000000000
--- a/src/java/gov/usgs/geomag/io/TimeseriesFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package gov.usgs.geomag.io;
-
-import java.io.IOException;
-import java.util.Date;
-
-public interface TimeseriesFactory {
-
- /**
- * Retrieve timeseries data for a specified observatory and component.
- *
- * @param observatory the observatory to fetch.
- * @param component the component to fetch.
- * @param starttime the time of the first sample.
- * @param endtime the time of the last sample.
- */
- public Timeseries getTimeseries(String observatory, String component,
- Date starttime, Date endtime) throws IOException;
-
-}
diff --git a/src/java/gov/usgs/geomag/io/TimeseriesTest.java b/src/java/gov/usgs/geomag/io/TimeseriesTest.java
deleted file mode 100644
index 62d8ccf5d6f2c93255c3a55bea8aba92ed349915..0000000000000000000000000000000000000000
--- a/src/java/gov/usgs/geomag/io/TimeseriesTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package gov.usgs.geomag.io;
-
-import gov.usgs.util.ISO8601;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-
-public class TimeseriesTest {
-
- /** Object for instance tests. */
- private Timeseries instance;
-
- /**
- * Create object for instance tests.
- */
- @Before
- public void setup () {
- Date start = ISO8601.parse("2014-01-01T01:01:00Z");
- Date end = ISO8601.parse("2014-01-01T01:01:04Z");
- instance = new Timeseries(start, end,
- getList(new String[] {"1.0", "1.1", "1.2", "1.3", "1.4"}));
- }
-
- /**
- * Test the getSampleTime method.
- */
- @Test
- public void testInstanceGetSampleTime() {
- Assert.assertNull("returns null when index before series start",
- instance.getSampleTime(-1));
- Assert.assertNull("returns null when index after series end",
- instance.getSampleTime(instance.getSamples().size()));
- Date expected = ISO8601.parse("2014-01-01T01:01:01Z");
- Assert.assertEquals("second sample is one second after first",
- expected, instance.getSampleTime(1));
- }
-
- /**
- * Test the getSampleIndex method.
- */
- @Test
- public void testInstanceGetSampleIndex() {
- Assert.assertNull("returns null when time before series start",
- instance.getSampleIndex(ISO8601.parse("2014-01-01T01:00:59Z")));
- Assert.assertNull("returns null when time after series end",
- instance.getSampleIndex(ISO8601.parse("2014-01-01T01:01:05Z")));
- Assert.assertEquals("second sample is one second after first",
- new Integer(1),
- instance.getSampleIndex(ISO8601.parse("2014-01-01T01:01:01Z")));
-
- Assert.assertNull("returns null when time not exactly at sample",
- instance.getSampleIndex(ISO8601.parse("2014-01-01T01:01:01.001Z")));
- Assert.assertEquals("rounds to nearest sample when exact is false",
- new Integer(1),
- instance.getSampleIndex(ISO8601.parse("2014-01-01T01:01:01.001Z"),
- false));
- Assert.assertEquals("rounds to nearest sample when exact is false",
- new Integer(2),
- instance.getSampleIndex(ISO8601.parse("2014-01-01T01:01:01.5Z"),
- false));
- }
-
- /**
- * Test the static computeSampleTime method.
- */
- @Test
- public void testStaticComputeSampleTime () {
- Date start = ISO8601.parse("2014-01-01T01:01:00Z");
- Date end = ISO8601.parse("2014-01-01T01:02:00Z");
- // 61st second (one based)
- Assert.assertEquals("end date matches using seconds", end,
- Timeseries.computeSampleTime(60, start, Timeseries.RATE_SECOND));
- // 2nd minute (one based)
- Assert.assertEquals("end date matches using minutes", end,
- Timeseries.computeSampleTime(1, start, Timeseries.RATE_MINUTE));
- }
-
- /**
- * Test the static computeSampleIndex method.
- */
- @Test
- public void testStaticComputeSampleIndex () {
- Date start = ISO8601.parse("2014-01-01T01:01:00Z");
- Date end = ISO8601.parse("2014-01-01T01:02:00Z");
- // 61st second (one based)
- Assert.assertEquals("sample index matches using seconds", 60,
- Timeseries.computeSampleIndex(end, start, Timeseries.RATE_SECOND));
- // 2nd minute (one based)
- Assert.assertEquals("sample index matches using minutes", 1,
- Timeseries.computeSampleIndex(end, start, Timeseries.RATE_MINUTE));
- }
-
- /**
- * Test the static computeSampleRate method.
- */
- @Test
- public void testStaticComputeSampleRate () {
- Date start = ISO8601.parse("2014-01-01T01:01:00Z");
- Date end = ISO8601.parse("2014-01-01T01:02:00Z");
- // one sample for each second (end - start + 1)
- Assert.assertEquals("sample rate matches using seconds",
- Timeseries.RATE_SECOND,
- Timeseries.computeSampleRate(61, start, end));
- // one sample for each minute (end - start + 1)
- Assert.assertEquals("sample rate matches using minutes",
- Timeseries.RATE_MINUTE,
- Timeseries.computeSampleRate(2, start, end));
- }
-
- /**
- * Test the static merge method.
- */
- @Test
- public void testStaticMerge () {
- Date start = ISO8601.parse("2014-01-01T01:01:00Z");
- Date end = ISO8601.parse("2014-01-01T01:01:04Z");
- Timeseries primary = new Timeseries(start, end,
- getList(new String[] {null, null, null, "1.3", null}));
- Timeseries secondary = new Timeseries(start, end,
- getList(new String[] {null, "2.1", null, "2.3", "2.4"}));
- Timeseries tertiary = new Timeseries(start, end,
- getList(new String[] {"3.0", null, null, "3.3", null}));
- Timeseries merged = Timeseries.merge(
- new Timeseries[] {primary, secondary, tertiary});
- Assert.assertEquals("start time matches", start, merged.getStartTime());
- Assert.assertEquals("end time matches", end, merged.getEndTime());
- Assert.assertEquals("rate matches", Timeseries.RATE_SECOND,
- merged.getSampleRate());
- // data from tertiary
- // data from secondary
- // null in all
- // data from primary
- // data from secondary
- Assert.assertEquals("samples merge as expected",
- getList(new String[] {"3.0", "2.1", null, "1.3", "2.4"}),
- merged.getSamples());
- }
-
- /**
- * Utility method for building testing data.
- *
- * @param data an array of null or string values to convert to BigDecimals.
- * @return list containing BigDecimal objects, or nulls.
- */
- private ArrayList<BigDecimal> getList(final String[] data) {
- ArrayList<BigDecimal> list = new ArrayList<BigDecimal>();
- for (String item : data) {
- list.add(item == null ? null : new BigDecimal(item));
- }
- return list;
- }
-
-}
diff --git a/src/java/gov/usgs/util/ISO8601.java b/src/java/gov/usgs/util/ISO8601.java
deleted file mode 100644
index a7650d7aae52819b44fce30879de2c1a6b89bbcb..0000000000000000000000000000000000000000
--- a/src/java/gov/usgs/util/ISO8601.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package gov.usgs.util;
-
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-/**
- * Convert between java.util.Date and ISO8601 string.
- *
- * @author jmfee
- */
-public class ISO8601 {
-
- /**
- * Convenience method to format a Date as an XML DateTime String.
- *
- * @param date
- * the date to format.
- * @return the normalized XML representation as a string.
- */
- public static String format(final Date date) {
- try {
- GregorianCalendar calendar = new GregorianCalendar();
- calendar.setTimeInMillis(date.getTime());
- return DatatypeFactory.newInstance().newXMLGregorianCalendar(calendar)
- .normalize().toXMLFormat();
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * Convenience method to parse an XML Date Time into a Date. Only useful when
- * the XML Date Time is within the Date object time range.
- *
- * @param toParse
- * the xml date time string to parse.
- * @return the parsed Date object.
- */
- public static Date parse(final String toParse) {
- try {
- XMLGregorianCalendar calendar = DatatypeFactory.newInstance()
- .newXMLGregorianCalendar(toParse);
- return new Date(calendar.toGregorianCalendar().getTimeInMillis());
- } catch (Exception e) {
- return null;
- }
- }
-
-}
diff --git a/src/java/gov/usgs/util/ISO8601Test.java b/src/java/gov/usgs/util/ISO8601Test.java
deleted file mode 100644
index a59510702570adcef05bf2c080e84fc809124c1d..0000000000000000000000000000000000000000
--- a/src/java/gov/usgs/util/ISO8601Test.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package gov.usgs.util;
-
-import java.util.Date;
-import org.junit.Test;
-import org.junit.Assert;
-
-/**
- * Test cases for the ISO8601 utility.
- */
-public class ISO8601Test {
-
- @Test
- public void construct() {
- new ISO8601();
- }
-
- /**
- * Date should parse correctly, and when parsed from normalized format
- * serialize identically.
- */
- @Test
- public void testRoundtrip() {
- String str = "2001-01-01T01:23:45.678Z";
-
- Date time = ISO8601.parse(str);
- Assert.assertEquals("time parses correctly", 978312225678L, time.getTime());
-
- String roundtrip = ISO8601.format(time);
- Assert.assertEquals("time matches after roundtrip", str, roundtrip);
- }
-
- /**
- * Invalid date formats should return null.
- */
- @Test
- public void testInvalid() {
- String str = "January, 1, 2001 at 1:23:45.678 am";
- Assert.assertNull("Invalid formats return null", ISO8601.parse(str));
- }
-
- /**
- * Null dates should return null.
- */
- @Test
- public void testNull() {
- Assert.assertNull("Null date returns null", ISO8601.format(null));
- }
-
-}
\ No newline at end of file