Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge changes from kerner1000 #1

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
962 changes: 481 additions & 481 deletions LICENSE.txt

Large diffs are not rendered by default.

Binary file added docs/readme.doc
Binary file not shown.
28 changes: 28 additions & 0 deletions nbactions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<actions>
<action>
<actionName>rebuild</actionName>
<packagings>
<packaging>*</packaging>
</packagings>
<goals>
<goal>clean</goal>
<goal>install</goal>
</goals>
<properties>
<skipTests>true</skipTests>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we want to skip tests?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably because there are test failures ;)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only a NetBeans config file, we could delete it.

</properties>
</action>
<action>
<actionName>build</actionName>
<packagings>
<packaging>*</packaging>
</packagings>
<goals>
<goal>install</goal>
</goals>
<properties>
<skipTests>true</skipTests>
</properties>
</action>
</actions>
32 changes: 32 additions & 0 deletions src/main/java/org/jcamp/JCAMPExceptionMissingDataRecord.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.jcamp;

import org.jcamp.parser.JCAMPException;

public class JCAMPExceptionMissingDataRecord extends JCAMPException {

/**
*
*/
private static final long serialVersionUID = -6502359150424254874L;

public JCAMPExceptionMissingDataRecord() {
super();

}

public JCAMPExceptionMissingDataRecord(String message) {
super(message);

}

public JCAMPExceptionMissingDataRecord(String message, Throwable cause) {
super(message, cause);

}

public JCAMPExceptionMissingDataRecord(Throwable cause) {
super(cause);

}

}
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/Array.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Licence should be LGPL!

* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.io.Serializable;
Expand Down Expand Up @@ -134,4 +141,4 @@ public String toString() {

return result.toString();
}
}
}
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/Array1D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.io.Serializable;
Expand Down Expand Up @@ -190,4 +197,4 @@ public void translate(double amount) {
array[i] += amount;
this.range.translate(amount);
}
}
}
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/Array2D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.io.Serializable;
Expand Down Expand Up @@ -221,4 +228,4 @@ public int getYLength() {
public Point2d pointAt(int index) {
return new Point2d(arrayX.pointAt(index), arrayY.pointAt(index));
}
}
}
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/ArrayND.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.io.Serializable;
Expand Down Expand Up @@ -128,4 +135,4 @@ public IArray1D getArray(int index) throws java.lang.ArrayIndexOutOfBoundsExcept
public int getDimension() {
return arrays.length;
}
}
}
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/AxisMap.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/ColorMap.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.awt.Color;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/ColorTable.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.awt.Color;
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/DataException.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand All @@ -20,7 +27,7 @@ public DataException() {

/**
* DataException constructor comment.
* @param s java.lang.String
* @param s String
*/
public DataException(String s) {
super(s);
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/DataMap.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/EmptyArray1D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/GreyColorMap.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.awt.Color;
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/Grid.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.io.Serializable;
Expand Down Expand Up @@ -123,4 +130,4 @@ public double[][] elementsAt(int[] indices) {
* @return double [][]
*/
public abstract double[][] valuesAt(double[][] grid);
}
}
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/Grid1D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.io.Serializable;
Expand Down Expand Up @@ -258,4 +265,4 @@ public double[] valuesAt(double[] grid) {
values[i] = valueAt(grid[i]);
return values;
}
}
}
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/Grid2D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import java.io.Serializable;
Expand Down Expand Up @@ -236,4 +243,4 @@ public double[][] valuesAt(double[][] grid) {
/**
*/
public abstract double[][] valuesAt(double[] gridx, double[] gridy);
}
}
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IArray1D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/org/jcamp/math/IArray2D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import javax.vecmath.Point2d;
Expand Down Expand Up @@ -35,4 +42,4 @@ public interface IArray2D
* @param index int
*/
public Point2d pointAt(int index);
}
}
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IAxis.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IInterval.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IInterval1D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IInterval2D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IOrderedArray1D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IOrderedArray2D.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

import javax.vecmath.Point2d;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/Integral.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/org/jcamp/math/IrregularAxisMap.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*******************************************************************************
* Copyright (c) 2015.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Public License v2.0
* which accompanies this distribution, and is available at
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
******************************************************************************/
package org.jcamp.math;

/**
Expand Down
Loading