Commit 9729a08f authored by Camille Coti's avatar Camille Coti
Browse files

Joseph's new algorithm

parent 012d3918
...@@ -90,6 +90,88 @@ gi::ex multiply_seq( tensor3D_t& T, matrix_int_t& J, int size ) { // simpler: s ...@@ -90,6 +90,88 @@ gi::ex multiply_seq( tensor3D_t& T, matrix_int_t& J, int size ) { // simpler: s
return Tens; return Tens;
} }
gi::ex multiply_seq2( tensor3D_t& T, matrix_int_t& J, int size ) {
gi::ex Tens = 0;
int a1, a2, a3, a4, a5, a6;
int A1, A2, A3, A4, A5, A6;
gi::ex W1, W2, W3, W4, W5, W6, W7;
gi::ex Z1, Z2, Z6, t5, tE, t1, t12, t123, t126, t13, t134, t14, t16, t2, t23, t24, t26, t3, t4, X7Y5;
gi::ex TE, T1, T2, T3, T4, T5, T12, T13, T14, T16, T23, T24, T26, T123, T126, T134;
TE = T1 = T2 = T3 = T4 = T5 = T12 = T13 = T14 = T16 = T23 = T24 = T26 = T123 = T126 = T134 = 0;
int N = size/2;
for( a4 = 0 ; a4 < N ; a4++ ) {
A4 = a4 + N;
for( a2 = 0 ; a2 < N ; a2++ ) {
A2 = a2 + N;
for( a6 = 0 ; a6 < N ; a6++ ) {
A6 = a6 + N;
W1 = T[a4][a2][a6];
W2 = T[a4][A2][a6];
W3 = T[a4][a2][A6];
W4 = T[A4][A2][a6];
W5 = T[a4][A2][A6];
W6 = T[A4][a2][A6];
W7 = T[A4][A2][A6];
for( a1 = 0 ; a1 < N ; a1++ ) {
A1 = a1 + N;
for( a5 = 0 ; a5 < N ; a5++ ) {
A5 = a5 + N;
Z1 = T[a1][a5][a6];
Z2 = T[A1][a5][a6];
Z6 = T[A1][a5][A6];
t5 = W3*T[a1][A5][a6];
tE = W4*T[A1][A5][A6];
t1 = W3*Z2;
t13 = t1;
t2 = W5*Z1;
t23 = t2;
t3 = W3*Z1;
t4 = W6*Z1;
t12 = W5*Z2;
t14 = W6*Z2;
t134 = t14 ;
t16 = W1*Z6;
t24 = W7*Z1;
t26 = W2*T[a1][a5][A6];
t123 = W5*Z2;
t126 = W2*Z6;
for( a3 = 0 ; a3 < N ; a3++ ) {
A3 = a3 + N;
TE = TE + tE*T[a1][a2][a3]*T[a4][a5][A3];
T5 = T5 + t5*T[A1][A2][A3]*T[A4][a5][a3];
X7Y5 = T[a1][A2][A3]*T[A4][A5][a3];
T1 = T1 + t1*X7Y5;
T16 = T16 + t16*X7Y5;
T2 = T2 + t2*T[A1][a2][A3]*T[A4][A5][a3];
T3 = T3 + t3*T[A1][A2][a3]*T[A4][A5][A3];
T4 = T4 + t4*T[A1][A2][A3]*T[a4][A5][a3];
T12 = T12 + t12*T[a1][a2][A3]*T[A4][A5][a3];
T13 = T13 + t13*T[a1][A2][a3]*T[A4][A5][A3];
T14 = T14 + t14*T[a1][A2][A3]*T[a4][A5][a3];
T23 = T23 + t23*T[A1][a2][a3]*T[A4][A5][A3];
T24 = T24 + t24*T[A1][a2][A3]*T[a4][A5][a3];
T26 = T26 + t26*T[A1][a2][A3]*T[A4][A5][a3];
T123 = T123 + t123*T[a1][a2][a3]*T[A4][A5][A3];
T126 = T126 + t126*T[a1][a2][A3]*T[A4][A5][a3];
T134 = T134 + t134*T[a1][A2][a3]*T[a4][A5][A3];
}
}
}
}
}
}
Tens = 4*(TE+T12+T13+T14+T16+T23+T24+T26 - (T1 + T2 + T3 + T4 + T5 +T123 + T126 + T134));
return Tens;
}
/******************************************************************************* /*******************************************************************************
* 1-level decomposition * * 1-level decomposition *
*******************************************************************************/ *******************************************************************************/
......
...@@ -127,6 +127,8 @@ int main( int argc, char** argv ){ ...@@ -127,6 +127,8 @@ int main( int argc, char** argv ){
init_simplectic( J, N, N ); init_simplectic( J, N, N );
gi::ex Tpar2;
/* Compute it in parallel */ /* Compute it in parallel */
tv_start = getTime(); tv_start = getTime();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment