diff --git a/.classpath b/.classpath deleted file mode 100644 index 777c00c..0000000 --- a/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index cf27a37..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1 +0,0 @@ -service_name: travis-pro diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 86aefb1..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -*.class - -# Package Files # -*.war -*.ear -.project -.settings diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a728738..0000000 --- a/.travis.yml +++ /dev/null @@ -1,116 +0,0 @@ -language: java -matrix: - include: - - jdk: oraclejdk7 - env: - - JDK_Test="Oracle JDK7 [ant]" - script: - - ant - - jdk: oraclejdk8 - env: - - JDK_Test="Oracle JDK8 [ant]" - script: - - ant - - jdk: openjdk6 - env: - - JDK_Test="open-JDK6 [ant]" - script: - - ant - - jdk: openjdk7 - env: - - JDK_Test="open-JDK7 [ant]" - script: - - ant - - jdk: oraclejdk7 - env: - - JDK_Test="Oracle JDK7 [maven]" - script: - - mvn test - - jdk: oraclejdk8 - env: - - JDK_Test="Oracle JDK8 [maven]" - script: - - mvn test - - jdk: openjdk6 - env: - - JDK_Test="open-JDK6 [maven]" - script: - - mvn test - - jdk: openjdk7 - env: - - JDK_Test="open-JDK7 [maven]" - script: - - mvn test - - sudo: required - language: java - services: docker - env: - - Deployment="Ubuntu_JDK6" - script: - - cd Dockerfiles/Ubuntu/openjdk6/ - - docker build -t ubuntu_jdk6 . - - sudo: required - language: java - services: docker - env: - - Deployment="Ubuntu_JDK7" - script: - - cd Dockerfiles/Ubuntu/openjdk7/ - - docker build -t ubuntu_jdk7 . - - sudo: required - language: java - services: docker - env: - - Deployment="Ubuntu_JDK8" - script: - - cd Dockerfiles/Ubuntu/openjdk8/ - - docker build -t ubuntu_jdk8 . - - sudo: required - language: java - services: docker - env: - - Deployment="Ubuntu_JDK9" - script: - - cd Dockerfiles/Ubuntu/openjdk9/ - - docker build -t ubuntu_jdk9 . -# - sudo: required -# language: java -# services: docker -# env: -# - Deployment="Debian_JDK7" -# script: -# - cd Dockerfiles/Debian/openjdk7/ -# - docker build -t debian_jdk7 . -# - sudo: required -# language: java -# services: docker -# env: -# - Deployment="Debian_JDK8" -# script: -# - cd Dockerfiles/Debian/openjdk8/ -# - docker build -t debian_jdk8 . -# - sudo: required -# language: java -# services: docker -# env: -# - Deployment="Archlinux_JDK7" -# script: -# - cd Dockerfiles/Archlinux/openjdk7/ -# - docker build -t archlinux_jdk7 . -# - sudo: required -# language: java -# services: docker -# env: -# - Deployment="Archlinux_JDK8" -# script: -# - cd Dockerfiles/Archlinux/openjdk8/ -# - docker build -t archlinux_jdk8 . -# - sudo: required -# language: java -# services: docker -# env: -# - Deployment="Fedora_JDK8" -# script: -# - cd Dockerfiles/Fedora/openjdk8/ -# - docker build -t fedora_jdk8 . -# diff --git a/Dockerfiles/Archlinux/build.sh b/Dockerfiles/Archlinux/build.sh deleted file mode 100644 index ad7d9a0..0000000 --- a/Dockerfiles/Archlinux/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -cd openjdk6 -docker build -t archlinux_openjdk6 . -cd ../openjdk7 -docker build -t archlinux_openjdk7 . -cd ../openjdk8 -docker build -t archlinux_openjdk8 . -cd .. -#docker rmi ubuntu_openjdk6 ubuntu_openjdk7 ubuntu_openjdk8 diff --git a/Dockerfiles/Archlinux/openjdk6/Dockerfile b/Dockerfiles/Archlinux/openjdk6/Dockerfile deleted file mode 100644 index 95be78a..0000000 --- a/Dockerfiles/Archlinux/openjdk6/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM base/archlinux -RUN pacman -Scc --noconfirm -RUN pacman-key --init -RUN pacman-key --populate archlinux -RUN pacman-key --refresh-keys -RUN pacman -Syyu --noconfirm -RUN pacman-db-upgrade -RUN pacman -Syyu --noconfirm -RUN pacman -S jdk6-openjdk git --noconfirm -RUN pacman -S apache-ant --noconfirm -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Archlinux/openjdk7/Dockerfile b/Dockerfiles/Archlinux/openjdk7/Dockerfile deleted file mode 100644 index 92c0cee..0000000 --- a/Dockerfiles/Archlinux/openjdk7/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM base/archlinux -RUN pacman -Scc --noconfirm -RUN pacman-key --init -RUN pacman-key --populate archlinux -RUN pacman-key --refresh-keys -RUN pacman -Syyu --noconfirm -RUN pacman-db-upgrade -RUN pacman -Syyu --noconfirm -RUN pacman -S jdk7-openjdk git --noconfirm -RUN pacman -S apache-ant --noconfirm -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Archlinux/openjdk8/Dockerfile b/Dockerfiles/Archlinux/openjdk8/Dockerfile deleted file mode 100644 index 424df93..0000000 --- a/Dockerfiles/Archlinux/openjdk8/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM base/archlinux -RUN pacman -Scc --noconfirm -RUN pacman-key --init -RUN pacman-key --populate archlinux -RUN pacman-key --refresh-keys -RUN pacman -Syyu --noconfirm -RUN pacman-db-upgrade -RUN pacman -Syyu --noconfirm -RUN pacman -S jdk8-openjdk git --noconfirm -RUN pacman -S apache-ant --noconfirm -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Debian/build.sh b/Dockerfiles/Debian/build.sh deleted file mode 100644 index 2a0e63e..0000000 --- a/Dockerfiles/Debian/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -cd openjdk6 -docker build -t debian_openjdk6 . -cd ../openjdk7 -docker build -t debian_openjdk7 . -cd ../openjdk8 -docker build -t debian_openjdk8 . -cd .. -#docker rmi ubuntu_openjdk6 ubuntu_openjdk7 ubuntu_openjdk8 diff --git a/Dockerfiles/Debian/openjdk6/Dockerfile b/Dockerfiles/Debian/openjdk6/Dockerfile deleted file mode 100644 index cf37498..0000000 --- a/Dockerfiles/Debian/openjdk6/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM debian -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install openjdk-6-jdk git -RUN apt-get -y install ant -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Debian/openjdk7/Dockerfile b/Dockerfiles/Debian/openjdk7/Dockerfile deleted file mode 100644 index 9ccfa7e..0000000 --- a/Dockerfiles/Debian/openjdk7/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM debian -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install openjdk-7-jdk git -RUN apt-get -y install ant -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Debian/openjdk8/Dockerfile b/Dockerfiles/Debian/openjdk8/Dockerfile deleted file mode 100644 index 77d4ce4..0000000 --- a/Dockerfiles/Debian/openjdk8/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM debian -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install openjdk-8-jdk git -RUN apt-get -y install ant -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Fedora/Dockerfile b/Dockerfiles/Fedora/Dockerfile deleted file mode 100644 index d36ea8e..0000000 --- a/Dockerfiles/Fedora/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM fedora - diff --git a/Dockerfiles/Fedora/openjdk8/Dockerfile b/Dockerfiles/Fedora/openjdk8/Dockerfile deleted file mode 100644 index 9583455..0000000 --- a/Dockerfiles/Fedora/openjdk8/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM fedora -RUN dnf -y distro-sync -RUN dnf -y install git java-1.8.0-openjdk-devel -RUN dnf -y install ant ant-junit -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN ssh-keygen -t rsa -N "" -f my.key -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/SuSe/Dockerfile b/Dockerfiles/SuSe/Dockerfile deleted file mode 100644 index 3d44e84..0000000 --- a/Dockerfiles/SuSe/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM opensuse - diff --git a/Dockerfiles/SuSe/openjdk7/Dockerfile b/Dockerfiles/SuSe/openjdk7/Dockerfile deleted file mode 100644 index f4242f2..0000000 --- a/Dockerfiles/SuSe/openjdk7/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM opensuse -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys dist-upgrade -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys update -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys install git java-1_7_0-openjdk-devel -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys install ant -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys clean -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN ssh-keygen -t rsa -N "" -f my.key -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/SuSe/openjdk8/Dockerfile b/Dockerfiles/SuSe/openjdk8/Dockerfile deleted file mode 100644 index d94e536..0000000 --- a/Dockerfiles/SuSe/openjdk8/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM opensuse -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys dist-upgrade -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys update -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys install git java-1_8_0-openjdk-devel -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys install ant -RUN zypper --non-interactive-include-reboot-patches --non-interactive --gpg-auto-import-keys clean -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN ssh-keygen -t rsa -N "" -f my.key -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Ubuntu/build.sh b/Dockerfiles/Ubuntu/build.sh deleted file mode 100644 index b34ea9c..0000000 --- a/Dockerfiles/Ubuntu/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -cd openjdk6 -docker build -t ubuntu_openjdk6 . -cd ../openjdk7 -docker build -t ubuntu_openjdk7 . -cd ../openjdk8 -docker build -t ubuntu_openjdk8 . -cd .. -#docker rmi ubuntu_openjdk6 ubuntu_openjdk7 ubuntu_openjdk8 diff --git a/Dockerfiles/Ubuntu/openjdk6/Dockerfile b/Dockerfiles/Ubuntu/openjdk6/Dockerfile deleted file mode 100644 index f5c0fa9..0000000 --- a/Dockerfiles/Ubuntu/openjdk6/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:14.04 -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install openjdk-6-jdk git -RUN apt-get -y install ant -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Ubuntu/openjdk7/Dockerfile b/Dockerfiles/Ubuntu/openjdk7/Dockerfile deleted file mode 100644 index 30456b3..0000000 --- a/Dockerfiles/Ubuntu/openjdk7/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:14.04 -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install openjdk-7-jdk git -RUN apt-get -y install ant -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Ubuntu/openjdk8/Dockerfile b/Dockerfiles/Ubuntu/openjdk8/Dockerfile deleted file mode 100644 index 6b44640..0000000 --- a/Dockerfiles/Ubuntu/openjdk8/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:16.04 -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install openjdk-8-jdk git -RUN apt-get -y install ant -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/Ubuntu/openjdk9/Dockerfile b/Dockerfiles/Ubuntu/openjdk9/Dockerfile deleted file mode 100644 index 0e1fc1b..0000000 --- a/Dockerfiles/Ubuntu/openjdk9/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM ubuntu:16.04 -RUN apt-get update -RUN apt-get -y upgrade -RUN apt-get -y install openjdk-9-jdk-headless git -RUN apt-get -y install ant -RUN mkdir /testsoftware -WORKDIR /testsoftware -RUN git clone https://github.com/TLoebner/JavaCalc.git -WORKDIR /testsoftware/JavaCalc -RUN java -version -RUN ant diff --git a/Dockerfiles/clean_docker.sh b/Dockerfiles/clean_docker.sh deleted file mode 100644 index c6090a9..0000000 --- a/Dockerfiles/clean_docker.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# Delete all containers -docker rm $(docker ps -a -q) -# Delete all images -docker rmi $(docker images -q) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 8f71f43..0000000 --- a/LICENSE +++ /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 {yyyy} {name of copyright owner} - - 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. - diff --git a/README.md b/README.md deleted file mode 100644 index 4a3bf82..0000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# JavaCalc - -## Build & Test Results -### Branch master -[![Build -Status](https://travis-ci.org/TLoebner/JavaCalc.svg?branch=master)](https://travis-ci.org/TLoebner/JavaCalc) -[![Circle CI](https://circleci.com/gh/TLoebner/JavaCalc/tree/master.svg?style=svg)](https://circleci.com/gh/TLoebner/JavaCalc/tree/master) -[ ![Codeship Status for TLoebner/JavaCalc](https://codeship.com/projects/7c6e8220-e47c-0133-76f3-7ef381c09b10/status?branch=master)](https://codeship.com/projects/146354) -[ ![Codeship Status for TLoebner/JavaCalc](https://codeship.com/projects/7c6e8220-e47c-0133-76f3-7ef381c09b10/status?branch=master)](https://codeship.com/projects/146354) -[![Run Status](https://api.shippable.com/projects/571139c22a8192902e1c8dea/badge?branch=master)](https://app.shippable.com/projects/571139c22a8192902e1c8dea) -[![Coverage Badge](https://api.shippable.com/projects/571139c22a8192902e1c8dea/coverageBadge?branch=master)](https://app.shippable.com/projects/571139c22a8192902e1c8dea) -[![wercker status](https://app.wercker.com/status/15e2d58f254cb7f999969708ca771149/m/master "wercker status")](https://app.wercker.com/project/bykey/15e2d58f254cb7f999969708ca771149) -[![ReviewNinja](https://app.review.ninja/46268749/badge)](https://app.review.ninja/TLoebner/JavaCalc) -[![Stories in Ready](https://badge.waffle.io/TLoebner/JavaCalc.png?label=ready&title=Ready)](https://waffle.io/TLoebner/JavaCalc) - - -## Build options - -### Jobs in build.xml (ant) - -``` -build - build classes from source -test - perform JUnit-tests -doc - create standard javadoc documentation -UML_doc - create UML-files with javadoc using ydoc -clean - clean all -``` - -### Jobs in pom.xml (maven) - -``` -build - build classes from source -test - perform JUnit-tests -javadoc:jar - create UML-files with javadoc using ydoc for sources -javadoc:test-jar - create UML-files with javadoc using ydoc for test cases -clean - clean all -``` diff --git a/build.xml b/build.xml deleted file mode 100644 index 874178e..0000000 --- a/build.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/circle.yml b/circle.yml deleted file mode 100644 index aa056ab..0000000 --- a/circle.yml +++ /dev/null @@ -1,3 +0,0 @@ -machine: - java: - version: openjdk7 \ No newline at end of file diff --git a/images/bkg.png b/images/bkg.png new file mode 100644 index 0000000..d10e5ca Binary files /dev/null and b/images/bkg.png differ diff --git a/images/blacktocat.png b/images/blacktocat.png new file mode 100644 index 0000000..9759d77 Binary files /dev/null and b/images/blacktocat.png differ diff --git a/index.html b/index.html new file mode 100644 index 0000000..732ac0f --- /dev/null +++ b/index.html @@ -0,0 +1,60 @@ + + + + + + + + + + + Javacalc by TLoebner + + + + +
+
+

Javacalc

+

+ +
+ Download as .zip + Download as .tar.gz + View on GitHub +
+
+
+ +
+
+

+Welcome to GitHub Pages.

+ +

This automatic page generator is the easiest way to create beautiful pages for all of your projects. Author your page content here using GitHub Flavored Markdown, select a template crafted by a designer, and publish. After your page is generated, you can check out the new gh-pages branch locally. If you’re using GitHub Desktop, simply sync your repository and you’ll see the new branch.

+ +

+Designer Templates

+ +

We’ve crafted some handsome templates for you to use. Go ahead and click 'Continue to layouts' to browse through them. You can easily go back to edit your page before publishing. After publishing your page, you can revisit the page generator and switch to another theme. Your Page content will be preserved.

+ +

+Creating pages manually

+ +

If you prefer to not use the automatic generator, push a branch named gh-pages to your repository to create a page manually. In addition to supporting regular HTML content, GitHub Pages support Jekyll, a simple, blog aware static site generator. Jekyll makes it easy to create site-wide headers and footers without having to copy them across every page. It also offers intelligent blog support and other advanced templating features.

+ +

+Authors and Contributors

+ +

You can @mention a GitHub username to generate a link to their profile. The resulting <a> element will link to the contributor’s GitHub Profile. For example: In 2007, Chris Wanstrath (@defunkt), PJ Hyett (@pjhyett), and Tom Preston-Werner (@mojombo) founded GitHub.

+ +

+Support or Contact

+ +

Having trouble with Pages? Check out our documentation or contact support and we’ll help you sort it out.

+
+
+ + + + diff --git a/javascripts/main.js b/javascripts/main.js new file mode 100644 index 0000000..d8135d3 --- /dev/null +++ b/javascripts/main.js @@ -0,0 +1 @@ +console.log('This would be the main JS file.'); diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar deleted file mode 100644 index 9d5fe16..0000000 Binary files a/lib/hamcrest-core-1.3.jar and /dev/null differ diff --git a/lib/jruby-complete-9.0.4.0.jar b/lib/jruby-complete-9.0.4.0.jar deleted file mode 100644 index 1640485..0000000 Binary files a/lib/jruby-complete-9.0.4.0.jar and /dev/null differ diff --git a/lib/junit-4.11.jar b/lib/junit-4.11.jar deleted file mode 100644 index aaf7444..0000000 Binary files a/lib/junit-4.11.jar and /dev/null differ diff --git a/lib/jython-standalone-2.7.0.jar b/lib/jython-standalone-2.7.0.jar deleted file mode 100644 index c494983..0000000 Binary files a/lib/jython-standalone-2.7.0.jar and /dev/null differ diff --git a/lib/styleed.jar b/lib/styleed.jar deleted file mode 100644 index 7ee10ee..0000000 Binary files a/lib/styleed.jar and /dev/null differ diff --git a/lib/ydoc.jar b/lib/ydoc.jar deleted file mode 100644 index 9a97cb5..0000000 Binary files a/lib/ydoc.jar and /dev/null differ diff --git a/manifest.mf b/manifest.mf deleted file mode 100644 index 328e8e5..0000000 --- a/manifest.mf +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -X-COMMENT: Main-Class will be added automatically by build - diff --git a/params.json b/params.json new file mode 100644 index 0000000..071d01f --- /dev/null +++ b/params.json @@ -0,0 +1 @@ +{"name":"Javacalc","tagline":"","body":"### Welcome to GitHub Pages.\r\nThis automatic page generator is the easiest way to create beautiful pages for all of your projects. Author your page content here [using GitHub Flavored Markdown](https://guides.github.com/features/mastering-markdown/), select a template crafted by a designer, and publish. After your page is generated, you can check out the new `gh-pages` branch locally. If you’re using GitHub Desktop, simply sync your repository and you’ll see the new branch.\r\n\r\n### Designer Templates\r\nWe’ve crafted some handsome templates for you to use. Go ahead and click 'Continue to layouts' to browse through them. You can easily go back to edit your page before publishing. After publishing your page, you can revisit the page generator and switch to another theme. Your Page content will be preserved.\r\n\r\n### Creating pages manually\r\nIf you prefer to not use the automatic generator, push a branch named `gh-pages` to your repository to create a page manually. In addition to supporting regular HTML content, GitHub Pages support Jekyll, a simple, blog aware static site generator. Jekyll makes it easy to create site-wide headers and footers without having to copy them across every page. It also offers intelligent blog support and other advanced templating features.\r\n\r\n### Authors and Contributors\r\nYou can @mention a GitHub username to generate a link to their profile. The resulting `` element will link to the contributor’s GitHub Profile. For example: In 2007, Chris Wanstrath (@defunkt), PJ Hyett (@pjhyett), and Tom Preston-Werner (@mojombo) founded GitHub.\r\n\r\n### Support or Contact\r\nHaving trouble with Pages? Check out our [documentation](https://help.github.com/pages) or [contact support](https://github.com/contact) and we’ll help you sort it out.\r\n","google":"","note":"Don't delete this file! It's used internally to help with page regeneration."} \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 976e4a6..0000000 --- a/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - 4.0.0 - - calculator - JavaCalc - 0.5-SNAPSHOT - jar - - Java Calculator - https://github.com/TLoebner/JavaCalc - - - ./src/ - ./test/ - ./target/ - ./test_target/ - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - ./uml_doc/ - public - ydoc.doclets.YStandard - ./lib/ydoc.jar:./lib/styleed.jar:./lib/resources - -umlautogen - - - - - - - - - junit - junit - 4.11 - test - - - \ No newline at end of file diff --git a/resources/styles/dark-matter-style.xml b/resources/styles/dark-matter-style.xml deleted file mode 100644 index f758d71..0000000 --- a/resources/styles/dark-matter-style.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/default-style.xml b/resources/styles/default-style.xml deleted file mode 100644 index 62c4afb..0000000 --- a/resources/styles/default-style.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/dotnet-style.xml b/resources/styles/dotnet-style.xml deleted file mode 100644 index 211966c..0000000 --- a/resources/styles/dotnet-style.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/gradient-style.xml b/resources/styles/gradient-style.xml deleted file mode 100644 index d25a41c..0000000 --- a/resources/styles/gradient-style.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/muted-colors-style.xml b/resources/styles/muted-colors-style.xml deleted file mode 100644 index 1fbbbc1..0000000 --- a/resources/styles/muted-colors-style.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/original-style.xml b/resources/styles/original-style.xml deleted file mode 100644 index 6f6495d..0000000 --- a/resources/styles/original-style.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/theBlues-style.xml b/resources/styles/theBlues-style.xml deleted file mode 100644 index 0ccf898..0000000 --- a/resources/styles/theBlues-style.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/yFiles-style.xml b/resources/styles/yFiles-style.xml deleted file mode 100644 index 934a953..0000000 --- a/resources/styles/yFiles-style.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/styles/ydocstyle.xsd b/resources/styles/ydocstyle.xsd deleted file mode 100644 index 2e87e15..0000000 --- a/resources/styles/ydocstyle.xsd +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/taglet_definitions.dtd b/resources/taglet_definitions.dtd deleted file mode 100644 index 263c395..0000000 --- a/resources/taglet_definitions.dtd +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - diff --git a/resources/taglet_definitions.xml b/resources/taglet_definitions.xml deleted file mode 100644 index 545a981..0000000 --- a/resources/taglet_definitions.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - Complexity - - - - - - Precondition - Preconditions - - - - - - Postcondition - Postconditions - - - - - - Author - - - \ No newline at end of file diff --git a/resources/taglet_templates.dtd b/resources/taglet_templates.dtd deleted file mode 100644 index 5df62d4..0000000 --- a/resources/taglet_templates.dtd +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/resources/taglet_templates.xml b/resources/taglet_templates.xml deleted file mode 100644 index 357600f..0000000 --- a/resources/taglet_templates.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/ydoc.cfg b/resources/ydoc.cfg deleted file mode 100644 index 07e99bf..0000000 --- a/resources/ydoc.cfg +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/ydoc.license b/resources/ydoc.license deleted file mode 100644 index 1b07d50..0000000 --- a/resources/ydoc.license +++ /dev/null @@ -1,7 +0,0 @@ -Licensee name: Community Edition -License scope: yDoc version 3.0 (promo) generated Tue Jul 26, 2011 -License type: Community Edition -Promotion text: yWorks UML Doclet -Promotion url: http://www.yworks.com/ - -b0ac8294d3f86ae0003f3a3a002ea3cf577df824efc6f20d8294f955dce580431935cfa7e5f930684da9ec2adf5a \ No newline at end of file diff --git a/src/calculator/Calculator.java b/src/calculator/Calculator.java deleted file mode 100644 index 548abae..0000000 --- a/src/calculator/Calculator.java +++ /dev/null @@ -1,61 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class Calculator { - - /** - * @param args the command line arguments - */ - public static void main(String[] args) { - calculator.basicCalc calculator = new calculator.basicCalc(); - calculator.basicCalc integer_calculator = new calculator.basicCalc(5,9); - calculator.basicCalc float_calculator = new calculator.basicCalc(5L,9L); - calculator.basicCalc long_calculator = new calculator.basicCalc(5.0f,9.0f); - calculator.basicCalc double_calculator = new calculator.basicCalc(5.0d,9.0d); - - - integer_calculator.add(); - System.out.println(integer_calculator.get_IErg() + " :: " + integer_calculator.get_LErg() + " :: " + integer_calculator.get_FErg() + " :: " + integer_calculator.get_DErg()); - integer_calculator.sub(); - System.out.println(integer_calculator.get_IErg() + " :: " + integer_calculator.get_LErg() + " :: " + integer_calculator.get_FErg() + " :: " + integer_calculator.get_DErg()); - integer_calculator.mul(); - System.out.println(integer_calculator.get_IErg() + " :: " + integer_calculator.get_LErg() + " :: " + integer_calculator.get_FErg() + " :: " + integer_calculator.get_DErg()); - integer_calculator.div(); - System.out.println(integer_calculator.get_IErg() + " :: " + integer_calculator.get_LErg() + " :: " + integer_calculator.get_FErg() + " :: " + integer_calculator.get_DErg()); - - float_calculator.add(); - System.out.println(float_calculator.get_IErg() + " :: " + float_calculator.get_LErg() + " :: " + float_calculator.get_FErg() + " :: " + float_calculator.get_DErg()); - float_calculator.sub(); - System.out.println(float_calculator.get_IErg() + " :: " + float_calculator.get_LErg() + " :: " + float_calculator.get_FErg() + " :: " + float_calculator.get_DErg()); - float_calculator.mul(); - System.out.println(float_calculator.get_IErg() + " :: " + float_calculator.get_LErg() + " :: " + float_calculator.get_FErg() + " :: " + float_calculator.get_DErg()); - float_calculator.div(); - System.out.println(float_calculator.get_IErg() + " :: " + float_calculator.get_LErg() + " :: " + float_calculator.get_FErg() + " :: " + float_calculator.get_DErg()); - - long_calculator.add(); - System.out.println(long_calculator.get_IErg() + " :: " + long_calculator.get_LErg() + " :: " + long_calculator.get_FErg() + " :: " + long_calculator.get_DErg()); - long_calculator.sub(); - System.out.println(long_calculator.get_IErg() + " :: " + long_calculator.get_LErg() + " :: " + long_calculator.get_FErg() + " :: " + long_calculator.get_DErg()); - long_calculator.mul(); - System.out.println(long_calculator.get_IErg() + " :: " + long_calculator.get_LErg() + " :: " + long_calculator.get_FErg() + " :: " + long_calculator.get_DErg()); - long_calculator.div(); - System.out.println(long_calculator.get_IErg() + " :: " + long_calculator.get_LErg() + " :: " + long_calculator.get_FErg() + " :: " + long_calculator.get_DErg()); - - double_calculator.add(); - System.out.println(double_calculator.get_IErg() + " :: " + double_calculator.get_LErg() + " :: " + double_calculator.get_FErg() + " :: " + double_calculator.get_DErg()); - double_calculator.sub(); - System.out.println(double_calculator.get_IErg() + " :: " + double_calculator.get_LErg() + " :: " + double_calculator.get_FErg() + " :: " + double_calculator.get_DErg()); - double_calculator.mul(); - System.out.println(double_calculator.get_IErg() + " :: " + double_calculator.get_LErg() + " :: " + double_calculator.get_FErg() + " :: " + double_calculator.get_DErg()); - double_calculator.div(); - System.out.println(double_calculator.get_IErg() + " :: " + double_calculator.get_LErg() + " :: " + double_calculator.get_FErg() + " :: " + double_calculator.get_DErg()); - - - } - -} diff --git a/src/calculator/DiferentialCalculusInterface.java b/src/calculator/DiferentialCalculusInterface.java deleted file mode 100644 index 5834086..0000000 --- a/src/calculator/DiferentialCalculusInterface.java +++ /dev/null @@ -1,16 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -interface DiferentialCalculusInterface { - - void Simple(double max_error); - void LinearInterpolated(double max_error); - void CubicSplineInterpolated(double max_error); - void UndeterminedCoefficients(double max_error); - void RichardsonExtrapolation(double max_error); -} \ No newline at end of file diff --git a/src/calculator/IntegralCalculusInterface.java b/src/calculator/IntegralCalculusInterface.java deleted file mode 100644 index cce3a3b..0000000 --- a/src/calculator/IntegralCalculusInterface.java +++ /dev/null @@ -1,18 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -interface IntegralCalculusInterface { - - void Rectangular(double max_error); - void NewtonCotes(double max_error); - void GaussChristofel(double max_error); - void Romberg(double max_error); - void AdaptivRomberg(double max_error); - void AdaptiveMultigrid(double max_error); - void MonteCarlo(double max_error); -} \ No newline at end of file diff --git a/src/calculator/NumaInterface.java b/src/calculator/NumaInterface.java deleted file mode 100644 index 996dbfe..0000000 --- a/src/calculator/NumaInterface.java +++ /dev/null @@ -1,29 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ - interface NumaInterface - { - void set_function1_points(double[][] points); - void set_function2_points(double[][] points); - void set_function1_exp(double[] points); - void set_function2_exp(double[] points); - void set_function1_type(char[] type); - void set_function2_type(char[] type); - void set_equation1_exp(double[][] exp); - void set_equation2_exp(double[][] exp); - double[][] get_function1_points(); - double[][] get_function2_points(); - double[] get_function1_exp(); - double[] get_function2_exp(); - char[] get_function1_type(); - char[] get_function2_type(); - double[] get_numa_error(); - double get_max_error(); - double[][] get_equation1_exp(); - double[][] get_equation2_exp(); - } \ No newline at end of file diff --git a/src/calculator/NumericCalculus.java b/src/calculator/NumericCalculus.java deleted file mode 100644 index 29a6361..0000000 --- a/src/calculator/NumericCalculus.java +++ /dev/null @@ -1,111 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class NumericCalculus implements NumaInterface { - double[][] function1_points; - double[][] function2_points; - double[] function1_exp; - double[] function2_exp; - double[][] equation1_exp; - double[][] equation2_exp; - char[] function1_type; - char[] function2_type; - double[] numa_error; - double max_error; - - public void set_function1_points(double[][] points) - { - this.function1_points = points; - } - - public void set_function2_points(double[][] points) - { - this.function2_points = points; - } - - public void set_function1_exp(double[] points) - { - this.function1_exp = points; - } - - public void set_function2_exp(double[] points) - { - this.function2_exp = points; - } - - public void set_function1_type(char[] type) - { - this.function1_type = type; - } - - public void set_function2_type(char[] type) - { - this.function2_type = type; - } - - public void set_equation1_exp(double[][] exp) - { - this.equation1_exp = exp; - } - - public void set_equation2_exp(double[][] exp) - { - this.equation2_exp = exp; - } - - public double[][] get_function1_points() - { - return this.function1_points; - } - - public double[][] get_function2_points() - { - return this.function2_points; - } - - public double[] get_function1_exp() - { - return this.function1_exp; - } - - public double[] get_function2_exp() - { - return this.function2_exp; - } - - public char[] get_function1_type() - { - return this.function1_type; - } - - public char[] get_function2_type() - { - return this.function2_type; - } - - public double[] get_numa_error() - { - return this.numa_error; - } - - public double get_max_error() - { - return this.max_error; - } - - public double[][] get_equation1_exp() - { - return this.equation1_exp; - } - - public double[][] get_equation2_exp() - { - return this.equation2_exp; - } - -} diff --git a/src/calculator/NumericDifferntialCalculus.java b/src/calculator/NumericDifferntialCalculus.java deleted file mode 100644 index a013ff0..0000000 --- a/src/calculator/NumericDifferntialCalculus.java +++ /dev/null @@ -1,31 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class NumericDifferntialCalculus extends NumericCalculus implements DiferentialCalculusInterface { - public void Simple(double max_error) - { - - } - - public void LinearInterpolated(double max_error) - { - - } - public void CubicSplineInterpolated(double max_error) - { - - } - public void UndeterminedCoefficients(double max_error) - { - - } - public void RichardsonExtrapolation(double max_error) - { - - } -} diff --git a/src/calculator/NumericIntegralCalculus.java b/src/calculator/NumericIntegralCalculus.java deleted file mode 100644 index 92b00fd..0000000 --- a/src/calculator/NumericIntegralCalculus.java +++ /dev/null @@ -1,45 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class NumericIntegralCalculus extends NumericCalculus implements IntegralCalculusInterface { - - public void Rectangular(double max_error) - { - - } - - public void NewtonCotes(double max_error) - { - - } - - public void GaussChristofel(double max_error) - { - - } - - public void Romberg(double max_error) - { - - } - - public void AdaptivRomberg(double max_error) - { - - } - - public void AdaptiveMultigrid(double max_error) - { - - } - - public void MonteCarlo(double max_error) - { - - } -} diff --git a/src/calculator/NumericInterpolation.java b/src/calculator/NumericInterpolation.java deleted file mode 100644 index 2b6ae3b..0000000 --- a/src/calculator/NumericInterpolation.java +++ /dev/null @@ -1,45 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class NumericInterpolation extends NumericCalculus { - - public void PolynomInterpolation(double max_error) - { - - } - - public void TrigonometricInterpolation(double max_error) - { - - } - - public void Bezier(double max_error) - { - - } - - public void DeCateljau(double max_error) - { - - } - - public void LinearSplineInterpolation(double max_error) - { - - } - - public void QuadraticSplineInterpolation(double max_error) - { - - } - - public void CubicSplineInterpolation(double max_error) - { - - } -} diff --git a/src/calculator/NumericLinearEquation.java b/src/calculator/NumericLinearEquation.java deleted file mode 100644 index e1ca711..0000000 --- a/src/calculator/NumericLinearEquation.java +++ /dev/null @@ -1,89 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class NumericLinearEquation extends NumericCalculus { - - /* - * - */ - public void GaussELimination(double max_error) - { - - } - - public void PivotIteration(double max_error) - { - - } - - public void Cholesky(double max_error) - { - - } - - public void GaussMeanSquares(double max_error) - { - - } - - public void Orthogonalization(double max_error) - { - - } - - public void GivensRotation(double max_error) - { - - } - - public void HouseholderReflection(double max_error) - { - - } - - public void FixedPointIteration(double max_error) - { - - } - - public void Newton(double max_error) - { - - } - - public void GaussNewton(double max_error) - { - - } - - public void VectorIteration(double max_error) - { - - } - - public void QR(double max_error) - { - - } - - public void SingularValueDecomposition(double max_error) - { - - } - - public void Tchebyscheff(double max_error) - { - - } - - public void Lanczos(double max_error) - { - - } - -} diff --git a/src/calculator/NumericNonLinearEquation.java b/src/calculator/NumericNonLinearEquation.java deleted file mode 100644 index 8ddf340..0000000 --- a/src/calculator/NumericNonLinearEquation.java +++ /dev/null @@ -1,11 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class NumericNonLinearEquation extends NumericCalculus { - -} diff --git a/src/calculator/basicCalc.java b/src/calculator/basicCalc.java deleted file mode 100644 index d2db063..0000000 --- a/src/calculator/basicCalc.java +++ /dev/null @@ -1,316 +0,0 @@ - -package calculator; - -/** - * - *

Java class for basic math. - * @author Torsten Loebner - */ -public class basicCalc { - private int IVar1,IVar2,IErg; - private long LVar1,LVar2,LErg; - private float FVar1,FVar2,FErg; - private double DVar1,DVar2,DErg; - -/** - *

Basic constructor without initialization of any field - * - * - *

- *
- * 
- * - * - */ - public basicCalc() - { - this.IVar1=0; - this.IVar2=0; - this.IErg=0; - - this.LVar1=0; - this.LVar2=0; - this.LErg=0; - - this.FVar1=0; - this.FVar2=0; - this.FErg=0; - - this.DVar1=0; - this.DVar2=0; - this.DErg=0; - } -/** - *

Basic constructor with initialization for integer operations - * @param var1 input variable 1 - * @param var2 input variable 2 - * - */ - public basicCalc(int var1, int var2) - { - this.IVar1=var1; - this.IVar2=var2; - this.IErg=0; - - this.LVar1=0; - this.LVar2=0; - this.LErg=0; - - this.FVar1=0; - this.FVar2=0; - this.FErg=0; - - this.DVar1=0; - this.DVar2=0; - this.DErg=0; - } -/** - *

Basic constructor with initialization for long operations - * @param var1 input variable 1 - * @param var2 input variable 2 - * - */ - public basicCalc(long var1, long var2) - { - this.IVar1=0; - this.IVar2=0; - this.IErg=0; - - this.LVar1=var1; - this.LVar2=var2; - this.LErg=0; - - this.FVar1=0; - this.FVar2=0; - this.FErg=0; - - this.DVar1=0; - this.DVar2=0; - this.DErg=0; - } -/** - *

Basic constructor with initialization for float operations - * @param var1 input variable 1 - * @param var2 input variable 2 - * - */ - public basicCalc(float var1, float var2) - { - this.IVar1=0; - this.IVar2=0; - this.IErg=0; - - this.LVar1=0; - this.LVar2=0; - this.LErg=0; - - this.FVar1=var1; - this.FVar2=var2; - this.FErg=0; - - this.DVar1=0; - this.DVar2=0; - this.DErg=0; - } -/** - *

Basic constructor with initialization for double operations - * @param var1 input variable 1 - * @param var2 input variable 2 - * - */ - public basicCalc(double var1, double var2) - { - this.IVar1=0; - this.IVar2=0; - this.IErg=0; - - this.LVar1=0; - this.LVar2=0; - this.LErg=0; - - this.FVar1=0; - this.FVar2=0; - this.FErg=0; - - this.DVar1=var1; - this.DVar2=var2; - this.DErg=0; - } - -/** - *

Sets integer input variable 1 - * @param var input variable - * - */ - public void set_Var1(int var) - { - this.IVar1=var; - } -/** - *

Sets integer input variable 2 - * @param var input variable - * - */ - public void set_Var2(int var) - { - this.IVar2=var; - } -/** - *

Sets long input variable 1 - * @param var input variable - * - */ - public void set_Var1(long var) - { - this.LVar1=var; - } -/** - *

Sets long input variable 2 - * @param var input variable - * - */ - public void set_Var2(long var) - { - this.LVar2=var; - } -/** - *

Sets float input variable 1 - * @param var input variable - * - */ - public void set_Var1(float var) - { - this.FVar1=var; - } -/** - *

Sets float input variable 2 - * @param var input variable - * - */ - public void set_Var2(float var) - { - this.FVar2=var; - } -/** - *

Sets double input variable 1 - * @param var input variable - * - */ - public void set_Var1(double var) - { - this.DVar1=var; - } -/** - *

Sets double input variable 2 - * @param var input variable - * - */ - public void set_Var2(double var) - { - this.DVar2=var; - } - -/** - *

returns integer calculation result - * @return integer result - * - */ - public int get_IErg() - { - return this.IErg; - } -/** - *

returns long calculation result - * @return long result - * - */ - public long get_LErg() - { - return this.LErg; - } -/** - *

returns float calculation result - * @return float result - * - */ - public float get_FErg() - { - return this.FErg; - } -/** - *

returns double calculation result - * @return double result - * - */ - public double get_DErg() - { - return this.DErg; - } - -/** - *

adds variable 1 to variable 2 - */ - public void add() - { - this.IErg = this.IVar1 + this.IVar2; - this.LErg = this.LVar1 + this.LVar2; - this.FErg = this.FVar1 + this.FVar2; - this.DErg = this.DVar1 + this.DVar2; - } -/** - *

subtacts variable 2 from variable 1 - */ - public void sub() - { - this.IErg = this.IVar1 - this.IVar2; - this.LErg = this.LVar1 - this.LVar2; - this.FErg = this.FVar1 - this.FVar2; - this.DErg = this.DVar1 - this.DVar2; - } -/** - *

multiplies variable 1 and variable 2 - */ - public void mul() - { - this.IErg = this.IVar1 * this.IVar2; - this.LErg = this.LVar1 * this.LVar2; - this.FErg = this.FVar1 * this.FVar2; - this.DErg = this.DVar1 * this.DVar2; - } -/** - *

divides variable 1 by variable 2 - */ - public void div() - { - try - { - this.IErg = this.IVar1 / this.IVar2; - }catch(ArithmeticException ae) - { - this.IErg = 0; - } - try - { - this.LErg = this.LVar1 / this.LVar2; - }catch(ArithmeticException ae) - { - this.LErg = 0L; - } - try - { - this.FErg = this.FVar1 / this.FVar2; - }catch(ArithmeticException ae) - { - this.FErg = 0.0f; - } - try - { - this.DErg = this.DVar1 / this.DVar2; - }catch(ArithmeticException ae) - { - this.DErg = 0.0d; - } - if (this.FErg != this.FErg) this.FErg=0.0f; - if (this.DErg != this.DErg) this.DErg=0.0d; - } -} diff --git a/stylesheets/github-dark.css b/stylesheets/github-dark.css new file mode 100644 index 0000000..0c393bf --- /dev/null +++ b/stylesheets/github-dark.css @@ -0,0 +1,116 @@ +/* + Copyright 2014 GitHub Inc. + + 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. + +*/ + +.pl-c /* comment */ { + color: #969896; +} + +.pl-c1 /* constant, markup.raw, meta.diff.header, meta.module-reference, meta.property-name, support, support.constant, support.variable, variable.other.constant */, +.pl-s .pl-v /* string variable */ { + color: #0099cd; +} + +.pl-e /* entity */, +.pl-en /* entity.name */ { + color: #9774cb; +} + +.pl-s .pl-s1 /* string source */, +.pl-smi /* storage.modifier.import, storage.modifier.package, storage.type.java, variable.other, variable.parameter.function */ { + color: #ddd; +} + +.pl-ent /* entity.name.tag */ { + color: #7bcc72; +} + +.pl-k /* keyword, storage, storage.type */ { + color: #cc2372; +} + +.pl-pds /* punctuation.definition.string, string.regexp.character-class */, +.pl-s /* string */, +.pl-s .pl-pse .pl-s1 /* string punctuation.section.embedded source */, +.pl-sr /* string.regexp */, +.pl-sr .pl-cce /* string.regexp constant.character.escape */, +.pl-sr .pl-sra /* string.regexp string.regexp.arbitrary-repitition */, +.pl-sr .pl-sre /* string.regexp source.ruby.embedded */ { + color: #3c66e2; +} + +.pl-v /* variable */ { + color: #fb8764; +} + +.pl-id /* invalid.deprecated */ { + color: #e63525; +} + +.pl-ii /* invalid.illegal */ { + background-color: #e63525; + color: #f8f8f8; +} + +.pl-sr .pl-cce /* string.regexp constant.character.escape */ { + color: #7bcc72; + font-weight: bold; +} + +.pl-ml /* markup.list */ { + color: #c26b2b; +} + +.pl-mh /* markup.heading */, +.pl-mh .pl-en /* markup.heading entity.name */, +.pl-ms /* meta.separator */ { + color: #264ec5; + font-weight: bold; +} + +.pl-mq /* markup.quote */ { + color: #00acac; +} + +.pl-mi /* markup.italic */ { + color: #ddd; + font-style: italic; +} + +.pl-mb /* markup.bold */ { + color: #ddd; + font-weight: bold; +} + +.pl-md /* markup.deleted, meta.diff.header.from-file */ { + background-color: #ffecec; + color: #bd2c00; +} + +.pl-mi1 /* markup.inserted, meta.diff.header.to-file */ { + background-color: #eaffea; + color: #55a532; +} + +.pl-mdr /* meta.diff.range */ { + color: #9774cb; + font-weight: bold; +} + +.pl-mo /* meta.output */ { + color: #264ec5; +} + diff --git a/stylesheets/stylesheet.css b/stylesheets/stylesheet.css new file mode 100644 index 0000000..a54a639 --- /dev/null +++ b/stylesheets/stylesheet.css @@ -0,0 +1,247 @@ +body { + margin: 0; + padding: 0; + background: #151515 url("../images/bkg.png") 0 0; + color: #eaeaea; + font: 16px; + line-height: 1.5; + font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; +} + +/* General & 'Reset' Stuff */ + +.container { + width: 90%; + max-width: 600px; + margin: 0 auto; +} + +section { + display: block; + margin: 0 0 20px 0; +} + +h1, h2, h3, h4, h5, h6 { + margin: 0 0 20px; +} + +li { + line-height: 1.4 ; +} + +/* Header,

+ header - container + h1 - project name + h2 - project description +*/ + +header { + background: rgba(0, 0, 0, 0.1); + width: 100%; + border-bottom: 1px dashed #b5e853; + padding: 20px 0; + margin: 0 0 40px 0; +} + +header h1 { + font-size: 30px; + line-height: 1.5; + margin: 0 0 0 -40px; + font-weight: bold; + font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; + color: #b5e853; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), + 0 0 5px rgba(181, 232, 83, 0.1), + 0 0 10px rgba(181, 232, 83, 0.1); + letter-spacing: -1px; + -webkit-font-smoothing: antialiased; +} + +header h1:before { + content: "./ "; + font-size: 24px; +} + +header h2 { + font-size: 18px; + font-weight: 300; + color: #666; +} + +#downloads .btn { + display: inline-block; + text-align: center; + margin: 0; +} + +/* Main Content +*/ + +#main_content { + width: 100%; + -webkit-font-smoothing: antialiased; +} +section img { + max-width: 100% +} + +h1, h2, h3, h4, h5, h6 { + font-weight: normal; + font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; + color: #b5e853; + letter-spacing: -0.03em; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), + 0 0 5px rgba(181, 232, 83, 0.1), + 0 0 10px rgba(181, 232, 83, 0.1); +} + +#main_content h1 { + font-size: 30px; +} + +#main_content h2 { + font-size: 24px; +} + +#main_content h3 { + font-size: 18px; +} + +#main_content h4 { + font-size: 14px; +} + +#main_content h5 { + font-size: 12px; + text-transform: uppercase; + margin: 0 0 5px 0; +} + +#main_content h6 { + font-size: 12px; + text-transform: uppercase; + color: #999; + margin: 0 0 5px 0; +} + +dt { + font-style: italic; + font-weight: bold; +} + +ul li { + list-style: none; +} + +ul li:before { + content: ">>"; + font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; + font-size: 13px; + color: #b5e853; + margin-left: -37px; + margin-right: 21px; + line-height: 16px; +} + +blockquote { + color: #aaa; + padding-left: 10px; + border-left: 1px dotted #666; +} + +pre { + background: rgba(0, 0, 0, 0.9); + border: 1px solid rgba(255, 255, 255, 0.15); + padding: 10px; + font-size: 14px; + color: #b5e853; + border-radius: 2px; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + text-wrap: normal; + overflow: auto; + overflow-y: hidden; +} + +table { + width: 100%; + margin: 0 0 20px 0; +} + +th { + text-align: left; + border-bottom: 1px dashed #b5e853; + padding: 5px 10px; +} + +td { + padding: 5px 10px; +} + +hr { + height: 0; + border: 0; + border-bottom: 1px dashed #b5e853; + color: #b5e853; +} + +/* Buttons +*/ + +.btn { + display: inline-block; + background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3)); + padding: 8px 18px; + border-radius: 50px; + border: 2px solid rgba(0, 0, 0, 0.7); + border-bottom: 2px solid rgba(0, 0, 0, 0.7); + border-top: 2px solid rgba(0, 0, 0, 1); + color: rgba(255, 255, 255, 0.8); + font-family: Helvetica, Arial, sans-serif; + font-weight: bold; + font-size: 13px; + text-decoration: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05); +} + +.btn:hover { + background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.6), rgba(35, 35, 35, 0.6) 50%, rgba(10, 10, 10, 0.8) 50%, rgba(0, 0, 0, 0.8)); +} + +.btn .icon { + display: inline-block; + width: 16px; + height: 16px; + margin: 1px 8px 0 0; + float: left; +} + +.btn-github .icon { + opacity: 0.6; + background: url("../images/blacktocat.png") 0 0 no-repeat; +} + +/* Links + a, a:hover, a:visited +*/ + +a { + color: #63c0f5; + text-shadow: 0 0 5px rgba(104, 182, 255, 0.5); +} + +/* Clearfix */ + +.cf:before, .cf:after { + content:""; + display:table; +} + +.cf:after { + clear:both; +} + +.cf { + zoom:1; +} \ No newline at end of file diff --git a/test/calculator/TestBasicCalc.java b/test/calculator/TestBasicCalc.java deleted file mode 100644 index 7ff391a..0000000 --- a/test/calculator/TestBasicCalc.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package calculator; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.*; - -/** - * - * @author user - */ -public class TestBasicCalc { - - public TestBasicCalc() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - /** - * Test of set_Var2 method, of class basicCalc. - */ - @Test - public void testSet_Var2_int() { - System.out.println("set_Var2"); - int var = 0; - basicCalc instance = new basicCalc(); - instance.set_Var2(var); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } -} diff --git a/test/calculator/TestBasicCalcIT.java b/test/calculator/TestBasicCalcIT.java deleted file mode 100644 index 84d7450..0000000 --- a/test/calculator/TestBasicCalcIT.java +++ /dev/null @@ -1,439 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package calculator; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import static org.junit.Assert.*; - -/** - * - * @author user - */ -public class TestBasicCalcIT { - - public TestBasicCalcIT() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - - /** - * Test of integer Adder. - */ - @Test - public void test_Integer_Adder() { - System.out.println("Test of integer Adder"); - basicCalc instance = new basicCalc(); - int expResult = 14; - instance.set_Var1(5); - instance.set_Var2(9); - instance.add(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(expResult, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - /** - * Test of long Adder. - */ - @Test - public void test_Long_Adder() { - System.out.println("Test of long Adder"); - basicCalc instance = new basicCalc(); - long expResult = 14L; - instance.set_Var1(5L); - instance.set_Var2(9L); - instance.add(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(expResult, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - - /** - * Test of float Adder. - */ - @Test - public void test_float_Adder() { - System.out.println("Test of float Adder"); - basicCalc instance = new basicCalc(); - float expResult = 14.0f; - instance.set_Var1(5.0f); - instance.set_Var2(9.0f); - instance.add(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(expResult, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - - /** - * Test of double Adder. - */ - @Test - public void test_double_Adder() { - System.out.println("Test of double Adder"); - basicCalc instance = new basicCalc(); - double expResult = 14.0d; - instance.set_Var1(5.0d); - instance.set_Var2(9.0d); - instance.add(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(expResult, result4, 0.0d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - /** - * Test of integer Sub. - */ - @Test - public void test_Integer_Sub() { - System.out.println("Test of integer Sub"); - basicCalc instance = new basicCalc(); - int expResult = -4; - instance.set_Var1(5); - instance.set_Var2(9); - instance.sub(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(expResult, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - /** - * Test of long Sub. - */ - @Test - public void test_Long_Sub() { - System.out.println("Test of long Sub"); - basicCalc instance = new basicCalc(); - long expResult = -4L; - instance.set_Var1(5L); - instance.set_Var2(9L); - instance.sub(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(expResult, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - - /** - * Test of float Sub. - */ - @Test - public void test_float_Sub() { - System.out.println("Test of float Sub"); - basicCalc instance = new basicCalc(); - float expResult = -4.0f; - instance.set_Var1(5.0f); - instance.set_Var2(9.0f); - instance.sub(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(expResult, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - - /** - * Test of double Sub. - */ - @Test - public void test_double_Sub() { - System.out.println("Test of double Sub"); - basicCalc instance = new basicCalc(); - double expResult = -4.0d; - instance.set_Var1(5.0d); - instance.set_Var2(9.0d); - instance.sub(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(expResult, result4, 0.0d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - /** - * Test of integer Mul. - */ - @Test - public void test_Integer_Mul() { - System.out.println("Test of integer Mul"); - basicCalc instance = new basicCalc(); - int expResult = 45; - instance.set_Var1(5); - instance.set_Var2(9); - instance.mul(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(expResult, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - /** - * Test of long Mul. - */ - @Test - public void test_Long_Mul() { - System.out.println("Test of long Mul"); - basicCalc instance = new basicCalc(); - long expResult = 45L; - instance.set_Var1(5L); - instance.set_Var2(9L); - instance.mul(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(expResult, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - - /** - * Test of float Mul. - */ - @Test - public void test_float_Mul() { - System.out.println("Test of float Mul"); - basicCalc instance = new basicCalc(); - float expResult = 45.0f; - instance.set_Var1(5.0f); - instance.set_Var2(9.0f); - instance.mul(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(expResult, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - - /** - * Test of double Mul. - */ - @Test - public void test_double_Mul() { - System.out.println("Test of double Mul"); - basicCalc instance = new basicCalc(); - double expResult = 45.0d; - instance.set_Var1(5.0d); - instance.set_Var2(9.0d); - instance.mul(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(expResult, result4, 0.0d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - - /** - * Test of integer Div. - */ - @Test - public void test_Integer_Div() { - System.out.println("Test of integer Div"); - basicCalc instance = new basicCalc(); - int expResult = 0; - instance.set_Var1(5); - instance.set_Var2(9); - instance.div(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(expResult, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - /** - * Test of long Div. - */ - @Test - public void test_Long_Div() { - System.out.println("Test of long Div"); - basicCalc instance = new basicCalc(); - long expResult = 0L; - instance.set_Var1(5L); - instance.set_Var2(9L); - instance.div(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(expResult, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(0.0d, result4, 0.0d); - } - - - /** - * Test of float Div. - */ - @Test - public void test_float_Div() { - System.out.println("Test of float Div"); - basicCalc instance = new basicCalc(); - float expResult = 0.5555f; - instance.set_Var1(5.0f); - instance.set_Var2(9.0f); - instance.div(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(expResult, result3, 0.0001f); - assertEquals(0.0d, result4, 0.0d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - - /** - * Test of double Div. - */ - @Test - public void test_double_Div() { - System.out.println("Test of double Div"); - basicCalc instance = new basicCalc(); - double expResult = 0.5555d; - instance.set_Var1(5.0d); - instance.set_Var2(9.0d); - instance.div(); - int result1 = instance.get_IErg(); - long result2 = instance.get_LErg(); - float result3 = instance.get_FErg(); - double result4 = instance.get_DErg(); - assertEquals(0, result1); - assertEquals(0L, result2); - assertEquals(0.0f, result3, 0.0f); - assertEquals(expResult, result4, 0.0001d); - // TODO review the generated test code and remove the default call to fail. - //fail("The test case is a prototype."); - } - - /** - * Complex Test - */ - @Test - public void test_complex_result() { - System.out.println("Complex Test"); - basicCalc instance = new basicCalc(); - instance.set_Var1(5); - instance.set_Var2(9); - instance.set_Var1(5L); - instance.set_Var2(9L); - instance.set_Var1(5.0f); - instance.set_Var2(9.0f); - instance.set_Var1(5.0d); - instance.set_Var2(9.0d); - instance.add(); - assertEquals(14, instance.get_IErg()); - assertEquals(14L, instance.get_LErg()); - assertEquals(14.0f, instance.get_FErg(), 0.0f); - assertEquals(14.0d, instance.get_DErg(), 0.0d); - instance.sub(); - assertEquals(-4, instance.get_IErg()); - assertEquals(-4L, instance.get_LErg()); - assertEquals(-4.0f, instance.get_FErg(), 0.0f); - assertEquals(-4.0d, instance.get_DErg(), 0.0d); - instance.mul(); - assertEquals(45, instance.get_IErg()); - assertEquals(45L, instance.get_LErg()); - assertEquals(45.0f, instance.get_FErg(), 0.0f); - assertEquals(45.0d, instance.get_DErg(), 0.0d); - instance.div(); - assertEquals(0, instance.get_IErg()); - assertEquals(0L, instance.get_LErg()); - assertEquals(0.5555f, instance.get_FErg(), 0.0001f); - assertEquals(0.5555d, instance.get_DErg(), 0.0001d); - } - -} diff --git a/wercker.yml b/wercker.yml deleted file mode 100644 index db7ee62..0000000 --- a/wercker.yml +++ /dev/null @@ -1,7 +0,0 @@ -box: maven:3-jdk-7 -build: - steps: - - script: - name: maven build - code: | - mvn clean javadoc:jar javadoc:test-jar test \ No newline at end of file