Author: [log in to unmask]
Date: Wed Jan 6 08:35:22 2016
New Revision: 4092
Log:
Update package paths and dependencies. Use double arraylist explicitly in matrix package.
Modified:
gbl/trunk/gbl/pom.xml
gbl/trunk/gbl/src/main/java/org/hps/gbl/GblData.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/GblPoint.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/GblTrajectory.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/MilleBinary.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/BorderedBandMatrix.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/EigenvalueDecomposition.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/LUDecomposition.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Matrix.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/QRDecomposition.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/SymMatrix.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VMatrix.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VSymMatrix.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VVector.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Vector.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/package-info.java
gbl/trunk/gbl/src/main/java/org/hps/gbl/package-info.java
Modified: gbl/trunk/gbl/pom.xml
=============================================================================
--- gbl/trunk/gbl/pom.xml (original)
+++ gbl/trunk/gbl/pom.xml Wed Jan 6 08:35:22 2016
@@ -14,5 +14,25 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.freehep</groupId>
+ <artifactId>freehep-physics</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.5</version>
+ </dependency>
</dependencies>
+
+ <repositories>
+ <repository>
+ <id>freehep-maven2-public</id>
+ <name>Maven FreeHEP</name>
+ <url>http://srs.slac.stanford.edu/nexus/content/groups/freehep-maven2-public/</url>
+ </repository>
+ </repositories>
+
+
</project>
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/GblData.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/GblData.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/GblData.java Wed Jan 6 08:35:22 2016
@@ -1,10 +1,12 @@
-package org.hps.recon.tracking.gbl;
+package org.hps.gbl;
import static java.lang.Math.sqrt;
+
import java.util.ArrayList;
import java.util.List;
-import org.hps.recon.tracking.gbl.matrix.Matrix;
-import org.hps.recon.tracking.gbl.matrix.VVector;
+
+import org.hps.gbl.matrix.Matrix;
+import org.hps.gbl.matrix.VVector;
/**
*
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/GblPoint.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/GblPoint.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/GblPoint.java Wed Jan 6 08:35:22 2016
@@ -1,11 +1,13 @@
-package org.hps.recon.tracking.gbl;
+package org.hps.gbl;
import java.util.ArrayList;
import java.util.List;
-import org.hps.recon.tracking.gbl.matrix.EigenvalueDecomposition;
-import org.hps.recon.tracking.gbl.matrix.Matrix;
-import org.hps.recon.tracking.gbl.matrix.SymMatrix;
-import org.hps.recon.tracking.gbl.matrix.Vector;
+
+import org.hps.gbl.matrix.EigenvalueDecomposition;
+import org.hps.gbl.matrix.Matrix;
+import org.hps.gbl.matrix.SymMatrix;
+import org.hps.gbl.matrix.Vector;
+import hep.physics.matrix.BasicMatrix;
/**
*
@@ -17,7 +19,7 @@
public class GblPoint
{
- public GblPoint(hep.physics.matrix.BasicMatrix jacPointToPoint)
+ public GblPoint(BasicMatrix jacPointToPoint)
{
theLabel = 0;
theOffset = 0;
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/GblTrajectory.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/GblTrajectory.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/GblTrajectory.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl;
+package org.hps.gbl;
/**
*
@@ -12,14 +12,16 @@
*/
import static java.lang.Math.abs;
import static java.lang.Math.max;
+
import java.util.ArrayList;
import java.util.List;
+
import org.apache.commons.math3.util.Pair;
-import org.hps.recon.tracking.gbl.matrix.BorderedBandMatrix;
-import org.hps.recon.tracking.gbl.matrix.Matrix;
-import org.hps.recon.tracking.gbl.matrix.SymMatrix;
-import org.hps.recon.tracking.gbl.matrix.VVector;
-import org.hps.recon.tracking.gbl.matrix.Vector;
+import org.hps.gbl.matrix.BorderedBandMatrix;
+import org.hps.gbl.matrix.Matrix;
+import org.hps.gbl.matrix.SymMatrix;
+import org.hps.gbl.matrix.VVector;
+import org.hps.gbl.matrix.Vector;
public class GblTrajectory
{
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/MilleBinary.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/MilleBinary.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/MilleBinary.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl;
+package org.hps.gbl;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/BorderedBandMatrix.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/BorderedBandMatrix.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/BorderedBandMatrix.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
import static java.lang.Math.abs;
import static java.lang.Math.min;
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/EigenvalueDecomposition.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/EigenvalueDecomposition.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/EigenvalueDecomposition.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
/** Eigenvalues and eigenvectors of a real matrix.
<P>
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/LUDecomposition.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/LUDecomposition.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/LUDecomposition.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
/** LU Decomposition.
<P>
For an m-by-n matrix A with m >= n, the LU decomposition is an m-by-n
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Matrix.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Matrix.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Matrix.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
import java.io.BufferedReader;
import java.io.PrintWriter;
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/QRDecomposition.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/QRDecomposition.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/QRDecomposition.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
/** QR Decomposition.
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/SymMatrix.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/SymMatrix.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/SymMatrix.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
/**
*
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VMatrix.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VMatrix.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VMatrix.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
import static java.lang.Math.min;
import java.util.ArrayList;
@@ -16,7 +16,7 @@
private int numRows;
private int numCols;
//TODO replace with a simple double[]
- private ArrayList theVec;
+ private ArrayList<Double> theVec;
public VMatrix(int nRows, int nCols)
{
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VSymMatrix.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VSymMatrix.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VSymMatrix.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
import static java.lang.Math.min;
import static java.lang.Math.max;
@@ -17,7 +17,7 @@
private int numRows;
//TODO replace with a simple double[]
- private ArrayList theVec;
+ private ArrayList<Double> theVec;
public VSymMatrix(int nRows)
{
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VVector.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VVector.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/VVector.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
import java.util.ArrayList;
import java.util.List;
@@ -15,7 +15,7 @@
{
private int numRows;
- private ArrayList theVec;
+ private ArrayList<Double> theVec;
public VVector(int nRows)
{
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Vector.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Vector.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/Vector.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
import java.io.PrintWriter;
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/package-info.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/package-info.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/matrix/package-info.java Wed Jan 6 08:35:22 2016
@@ -1,4 +1,4 @@
/**
* Matrix utilities for GBL
*/
-package org.hps.recon.tracking.gbl.matrix;
+package org.hps.gbl.matrix;
Modified: gbl/trunk/gbl/src/main/java/org/hps/gbl/package-info.java
=============================================================================
--- gbl/trunk/gbl/src/main/java/org/hps/gbl/package-info.java (original)
+++ gbl/trunk/gbl/src/main/java/org/hps/gbl/package-info.java Wed Jan 6 08:35:22 2016
@@ -3,4 +3,4 @@
* <p>
* <a href="http://www.desy.de/~kleinwrt/GBL/doc/cpp/html/">GBL C++ documentation</a>
*/
-package org.hps.recon.tracking.gbl;
+package org.hps.gbl;
