Skip to content

build: remove jnp-hipo dependence (a.k.a. HIPO 3) #1536

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.

Sign up for GitHub

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

Open
c-dilks wants to merge 1 commit into
base: development
Choose a base branch
from
Open

build: remove jnp-hipo dependence (a.k.a. HIPO 3) #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions common-tools/clas-analysis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@
<artifactId>groot</artifactId>
</dependency>

<dependency>
<groupId>org.jlab.jnp</groupId>
<artifactId>jnp-hipo</artifactId>
</dependency>

<dependency>
<groupId>org.jlab.jnp</groupId>
<artifactId>jnp-hipo4</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions common-tools/clas-detector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
</dependency>

<dependency>
<groupId>org.jlab.jnp</groupId>
<artifactId>jnp-hipo</artifactId>
<groupId>org.jlab.coda</groupId>
<artifactId>jevio</artifactId>
<classifier>jar-with-dependencies</classifier>
</dependency>

<dependency>
Expand Down
53 changes: 53 additions & 0 deletions common-tools/clas-physics/src/main/java/org/jlab/jnp/matrix/Matrix.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* 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 org.jlab.jnp.matrix;

/**
*
* @author gavalian
*/
public class Matrix {

protected double M[][] = new double[5][5];

public Matrix(){

}

public double get(int i, int j){
return M[i][j];
}

public void reset(){
for(int i = 0; i < 5; i++){
for(int j = 0; j < 5; j++){
M[i][j] = 0.0;
}
}
}


public void set(double A[][]){
for(int i = 0; i < 5; i++){
for(int j = 0; j < 5; j++){
M[i][j] = A[i][j];
}
}
}

public void set(double... values){
if(values.length<25){
System.out.println("[jnp::matrix] error *** number of arguments = " + values.length + " , expected 25" );
} else {
int count = 0;
for(int j = 0; j < 5; j++){
for(int i = 0; i < 5; i++){
M[i][j] = values[count]; count++;
}
}
}
}
}
231 changes: 231 additions & 0 deletions common-tools/clas-physics/src/main/java/org/jlab/jnp/matrix/Matrix5x5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
/*
* 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 org.jlab.jnp.matrix;

/**
*
* @author gavalian
*/
public class Matrix5x5 {
public static double determinant(double A[][]){
double D =
+ A[0][0]*A[1][1]*A[2][2]*A[3][3]*A[4][4] + A[0][0]*A[1][1]*A[2][3]*A[3][4]*A[4][2] + A[0][0]*A[1][1]*A[2][4]*A[3][2]*A[4][3]
- A[0][0]*A[1][1]*A[2][4]*A[3][3]*A[4][2] - A[0][0]*A[1][1]*A[2][3]*A[3][2]*A[4][4] - A[0][0]*A[1][1]*A[2][2]*A[3][4]*A[4][3]
- A[0][0]*A[2][1]*A[1][2]*A[3][3]*A[4][4] - A[0][0]*A[2][1]*A[1][3]*A[3][4]*A[4][2] - A[0][0]*A[2][1]*A[1][4]*A[3][2]*A[4][3]
+ A[0][0]*A[2][1]*A[1][4]*A[3][3]*A[4][2] + A[0][0]*A[2][1]*A[1][3]*A[3][2]*A[4][4] + A[0][0]*A[2][1]*A[1][2]*A[3][4]*A[4][3]
+ A[0][0]*A[3][1]*A[1][2]*A[2][3]*A[4][4] + A[0][0]*A[3][1]*A[1][3]*A[2][4]*A[4][2] + A[0][0]*A[3][1]*A[1][4]*A[2][2]*A[4][3]
- A[0][0]*A[3][1]*A[1][4]*A[2][3]*A[4][2] - A[0][0]*A[3][1]*A[1][3]*A[2][2]*A[4][4] - A[0][0]*A[3][1]*A[1][2]*A[2][4]*A[4][3]
- A[0][0]*A[4][1]*A[1][2]*A[2][3]*A[3][4] - A[0][0]*A[4][1]*A[1][3]*A[2][4]*A[3][2] - A[0][0]*A[4][1]*A[1][4]*A[2][2]*A[3][3]
+ A[0][0]*A[4][1]*A[1][4]*A[2][3]*A[3][2] + A[0][0]*A[4][1]*A[1][3]*A[2][2]*A[3][4] + A[0][0]*A[4][1]*A[1][2]*A[2][4]*A[3][3]

- A[1][0]*A[0][1]*A[2][2]*A[3][3]*A[4][4] - A[1][0]*A[0][1]*A[2][3]*A[3][4]*A[4][2] - A[1][0]*A[0][1]*A[2][4]*A[3][2]*A[4][3]
+ A[1][0]*A[0][1]*A[2][4]*A[3][3]*A[4][2] - A[1][0]*A[0][1]*A[2][3]*A[3][2]*A[4][4] - A[1][0]*A[0][1]*A[2][2]*A[3][4]*A[4][3]
+ A[1][0]*A[2][1]*A[0][2]*A[3][3]*A[4][4] + A[1][0]*A[2][1]*A[0][3]*A[3][4]*A[4][2] + A[1][0]*A[2][1]*A[0][4]*A[3][2]*A[4][3]
- A[1][0]*A[2][1]*A[0][4]*A[3][3]*A[4][2] - A[1][0]*A[2][1]*A[0][3]*A[3][2]*A[4][4] - A[1][0]*A[2][1]*A[0][2]*A[3][4]*A[4][3]
- A[1][0]*A[3][1]*A[0][2]*A[2][3]*A[4][4] - A[1][0]*A[3][1]*A[0][3]*A[2][4]*A[4][2] - A[1][0]*A[3][1]*A[0][4]*A[2][2]*A[4][3]
+ A[1][0]*A[3][1]*A[0][4]*A[2][3]*A[4][2] + A[1][0]*A[3][1]*A[0][3]*A[2][2]*A[4][4] + A[1][0]*A[3][1]*A[0][2]*A[2][4]*A[4][3]
+ A[1][0]*A[4][1]*A[0][2]*A[2][3]*A[3][4] + A[1][0]*A[4][1]*A[0][3]*A[2][4]*A[3][2] + A[1][0]*A[4][1]*A[0][4]*A[2][2]*A[3][3]
- A[1][0]*A[4][1]*A[0][4]*A[2][3]*A[3][2] - A[1][0]*A[4][1]*A[0][3]*A[2][2]*A[3][4] - A[1][0]*A[4][1]*A[0][2]*A[2][4]*A[3][3]

+ A[2][0]*A[0][1]*A[1][2]*A[3][3]*A[4][4] + A[2][0]*A[0][1]*A[1][3]*A[3][4]*A[4][2] + A[2][0]*A[0][1]*A[1][4]*A[3][2]*A[4][3]
- A[2][0]*A[0][1]*A[1][4]*A[3][3]*A[4][2] - A[2][0]*A[0][1]*A[1][3]*A[3][2]*A[4][4] - A[2][0]*A[0][1]*A[1][2]*A[3][4]*A[4][3]
- A[2][0]*A[1][1]*A[0][2]*A[3][3]*A[4][4] - A[2][0]*A[1][1]*A[0][3]*A[3][4]*A[4][2] - A[2][0]*A[1][1]*A[0][4]*A[3][2]*A[4][3]
- A[2][0]*A[1][1]*A[0][4]*A[3][3]*A[4][2] - A[2][0]*A[1][1]*A[0][3]*A[3][2]*A[4][4] - A[2][0]*A[1][1]*A[0][2]*A[3][4]*A[4][3]
+ A[2][0]*A[3][1]*A[0][2]*A[1][3]*A[4][4] + A[2][0]*A[3][1]*A[0][3]*A[1][4]*A[4][2] + A[2][0]*A[3][1]*A[0][4]*A[1][2]*A[4][3]
- A[2][0]*A[3][1]*A[0][4]*A[1][3]*A[4][2] - A[2][0]*A[3][1]*A[0][3]*A[1][2]*A[4][4] - A[2][0]*A[3][1]*A[0][2]*A[1][4]*A[4][3]
- A[2][0]*A[4][1]*A[0][2]*A[1][3]*A[3][4] - A[2][0]*A[4][1]*A[0][3]*A[1][4]*A[3][2] - A[2][0]*A[4][1]*A[0][4]*A[1][2]*A[3][3]
+ A[2][0]*A[4][1]*A[0][4]*A[1][3]*A[3][2] + A[2][0]*A[4][1]*A[0][3]*A[1][2]*A[3][4] + A[2][0]*A[4][1]*A[0][2]*A[1][4]*A[3][3];

return D;
}

public static void transpose(double A[][], double T[][]){
for(int i = 0; i < 5; i++){
for(int j = 0; j < 5; j++){
T[j][i] = A[i][j];
}
}
}

public static void add(double A[][], double B[][], double C[][]){
for(int i = 0; i < 5; i++){
for(int j = 0; j < 5; j++){
C[i][j] = A[i][j] + B[i][j];
}
}
}

public static double inverseOLD(double A[][], double I[][]){
//Matrix5x5.transpose(A, I);
double det = Matrix5x5.determinant(A);
if(Math.abs(det)<1e-30) return det;
double factor = 1.0/det;
for(int i = 0; i < 5; i++){
for(int j = 0; j < 5; j++){
I[i][j] = A[j][i]*factor;
}
}
return det;
}

public static void copy(double A[][], double B[][]){
for(int i = 0; i < 5; i++){
for(int j = 0; j < 5; j++){
B[i][j] = A[i][j];
}
}
}

public static void copy(Matrix A, Matrix B){
Matrix5x5.copy(A.M, B.M);
}

public static double det(Matrix m){
return Matrix5x5.determinant(m.M);
}

public static void add(Matrix a, Matrix b, Matrix c){
Matrix5x5.add(a.M, b.M, c.M);
}
public static double inverse(double A[][], double B[][], double adj[][]){

double det = 0.0;


adj[0][0] = Matrix5x5_4x4.determinant__00(A);
adj[0][1] = -Matrix5x5_4x4.determinant__01(A);
adj[0][2] = Matrix5x5_4x4.determinant__02(A);
adj[0][3] = -Matrix5x5_4x4.determinant__03(A);
adj[0][4] = Matrix5x5_4x4.determinant__04(A);

adj[1][0] = -Matrix5x5_4x4.determinant__10(A);
adj[1][1] = Matrix5x5_4x4.determinant__11(A);
adj[1][2] = -Matrix5x5_4x4.determinant__12(A);
adj[1][3] = Matrix5x5_4x4.determinant__13(A);
adj[1][4] = -Matrix5x5_4x4.determinant__14(A);

adj[2][0] = Matrix5x5_4x4.determinant__20(A);
adj[2][1] = -Matrix5x5_4x4.determinant__21(A);
adj[2][2] = Matrix5x5_4x4.determinant__22(A);
adj[2][3] = -Matrix5x5_4x4.determinant__23(A);
adj[2][4] = Matrix5x5_4x4.determinant__24(A);

adj[3][0] = -Matrix5x5_4x4.determinant__30(A);
adj[3][1] = Matrix5x5_4x4.determinant__31(A);
adj[3][2] = -Matrix5x5_4x4.determinant__32(A);
adj[3][3] = Matrix5x5_4x4.determinant__33(A);
adj[3][4] = -Matrix5x5_4x4.determinant__34(A);

adj[4][0] = Matrix5x5_4x4.determinant__40(A);
adj[4][1] = -Matrix5x5_4x4.determinant__41(A);
adj[4][2] = Matrix5x5_4x4.determinant__42(A);
adj[4][3] = -Matrix5x5_4x4.determinant__43(A);
adj[4][4] = Matrix5x5_4x4.determinant__44(A);

for(int i = 0; i < 5; i++){
det += A[i][0]*adj[i][0];
}

double factor = 1.0/det;

for(int i = 0; i < 5; i++){
for(int j = 0; j < 5; j++){
B[i][j] = factor*adj[j][i];
}
}
return det;
}
public static double inverse(Matrix source, Matrix inv, Matrix adj){
double det = Matrix5x5.inverse(source.M, inv.M,adj.M);
return det;
}

public static void show(Matrix matrix, String format){
System.out.println("----------- MATRIX ------------");

StringBuilder str = new StringBuilder();
str.append("{\n");
for(int i = 0; i < 5; i++){
str.append("{");
// System.out.println();
for(int j = 0; j < 5; j++){
if(j!=0) str.append(",");
str.append(String.format(format, matrix.M[i][j]));
}
str.append(" }");
if(i!=4) str.append(",");
str.append("\n");
}
str.append("}\n");
System.out.println(str.toString());
}

public static void show(Matrix matrix){
Matrix5x5.show(matrix, "%12.6f ");
}

public static void main(String[] args){

double A[][] = new double[][]{
{ 53.4644, -0.0000, 0.0005, -0.0000, -0.0000 },
{-0.0000 ,4806.6062, -0.0000 , 0.0493, 0.0000 },
{ 0.0005 , -0.0000 , 0.0005 , -0.0000 , -0.0000 },
{ -0.0000 , 0.0493 , -0.0000 , 0.0425 , 0.0000 },
{ -0.0000 , 0.0000 , -0.0000 , 0.0000 , 0.0005}

};

Matrix matrix = new Matrix();
Matrix matrixS = new Matrix();


/*matrix.set(5.0, -2.0, 2.0, 7.0, 1.0,
1, 0, 0, 3, 4.5,
-3, 1, 5, 0, 1.5,
3, -1, -9, 4,2.7,
4.5,3.0,-1.0,0.0,7.0);*/
matrixS.set( 53.4644, -0.0000, 0.0005, -0.0000, -0.0000,
-0.0000 ,4806.6062, -0.0000 , 0.0493, 0.0000,
0.0005 , -0.0000 , 0.0005 , -0.0000 , -0.0000,
-0.0000 , 0.0493 , -0.0000 , 0.0425 , 0.0000 ,
-0.0000 , 0.0000 , -0.0000 , 0.0000 , 0.0005);
matrix.set(A);
matrix.set(
0.221861 , -0.205768 , 0.001885 , -0.002347 , 0.000156 ,
-0.075577 , 4.653238 , 0.004701 , 0.056044 , 0.000315 ,
0.000155 , 0.007011 , 0.000012 , 0.000088 , 0.000006 ,
-0.000703 , 0.056124 , 0.000061 , 0.000681 , 0.000010 ,
0.000158 , 0.000312 , 0.000006 , 0.000010 , 0.000011 );
Matrix5x5.show(matrix);
Matrix5x5.show(matrixS);
for(int i = 0; i < 5; i++){
System.err.println(i + " -> " + A[0][i] + " matrix = " + matrix.get(0, i));

}
System.out.println("-------------- END -----------------");


Matrix m_inv = new Matrix();
Matrix m_add = new Matrix();
Matrix m_adj = new Matrix();
// The inverse function returns the determinant
// if determinant is smaller than 1e-30,
// the matrix is not reversed.
double det = Matrix5x5.inverse(matrix, m_inv,m_adj);

if(Math.abs(det)<1e-30){
System.out.println("error: can't inverse the matrix....");
}
System.out.println("determinant = " + det);
Matrix5x5.add(matrix, matrix, m_add);

Matrix5x5.show(matrix);
Matrix5x5.show(m_add);
Matrix5x5.show(m_inv);


}
}
Loading
Loading