mmarco/SIROCCO2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Treat degree 2 case and add adapt according test.

Browse Source
This commit is contained in:
Miguel Marco 2017-03-02 20:25:35 +01:00
parent 13fbfb0f88
commit 2aa33c035a
Signed by: mmarco
GPG Key ID: DD0114EDB7410592
2 changed files with 47 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/polynomial.hpp
View File

@ -309,6 +309,16 @@ T Polynomial<T>::diffXX (const T &x, const T &y) const {
// sets output to 0+0i
T rop;
if (this->degree == 1){
return rop;
}
if (this->degree == 2)
{
rop = T(2)*(this->coef)[3];
return rop;
}
// compute all powers of x and y
// (from 0 to degree-2) (from 0 to degree-2) resp
@ -340,6 +350,17 @@ T Polynomial<T>::diffXY (const T &x, const T &y) const {
// sets output to 0+0i
T rop;
if (this->degree == 1){
return rop;
}
if (this->degree == 2)
{
rop = T(2)*(this->coef)[4];
return rop;
}
// compute all powers of x and y
// (from 0 to degree-2) (from 0 to degree-2) resp
@ -372,6 +393,16 @@ T Polynomial<T>::diffYY (const T &x, const T &y) const {
// sets output to 0+0i
T rop;
if (this->degree == 1){
return rop;
}
if (this->degree == 2)
{
rop = T(2)*(this->coef)[5];
return rop;
}
// compute all powers of x and y
// (from 0 to degree-2) (from 0 to degree-2) resp

43
tests/sirocco_minimal_test.cpp
View File

@ -6,38 +6,27 @@ int main(int argc, char const *argv[]) {
mpfr_set_default_prec (162);
double testCoefs[] = {0.000000000000000, -0.000000000000000, 0.000000000000000,
-0.000000000000000, 0.000000000000000, -0.000000000000000,
0.000000000000000, -0.000000000000000, -128.000000000000,
-128.000000000000, -96.0000000000000, -96.0000000000000,
0.000000000000000, -0.000000000000000, 0.000000000000000,
-0.000000000000000, 72.0000000000000, 72.0000000000000,
304.000000000000, 304.000000000000, 12.0000000000000,
12.0000000000000, 180.000000000000, 180.000000000000,
0.000000000000000, -0.000000000000000, 0.000000000000000,
-0.000000000000000, 90.0000000000000, 90.0000000000000,
-182.500000000000, -182.500000000000, 133.500000000000,
133.500000000000, -190.500000000000, -190.500000000000,
42.0000000000000, 42.0000000000000, -44.0000000000000,
-44.0000000000000, 0.000000000000000, -0.000000000000000,
0.000000000000000, -0.000000000000000, -40.2500000000000,
-40.2500000000000, 18.2500000000000, 18.2500000000000,
-72.0000000000000, -72.0000000000000, 21.0000000000000,
21.0000000000000, -38.5000000000000, -38.5000000000000,
5.50000000000000, 5.50000000000000, -6.00000000000000,
-6.00000000000000, -0.000000000000000, 0.000000000000000};
double testCoefs[] = {
-2.000000000000000, -2.000000000000000, 0.000000000000000, 0.000000000000000,
0.000000000000000, 0.000000000000000, 0.000000000000000, -0.000000000000000,
0.000000000000, 0.000000000000, 0.0000000000000, 0.0000000000000,
1.000000000000000, 1.000000000000000, 0.000000000000000, -0.000000000000000,
0.00000000000000, 0.000000000000000, 0.000000000000000, 0.0000000000000000,
1.0000000000000, 1.000000000000000, 0.000000000000000, 0.0000000000000000
};
double y0R = 4.0;
double y0I = -4.0;
double *rop = homotopyPath (4, testCoefs, y0R, y0I);
double y0R = 1.414;
double y0I = 0.0;
double *rop = homotopyPath (2, testCoefs, y0R, y0I);
int len = (int) rop[0];
int i;
delete [] rop;
mpfr_t mp_testCoefs[60];
for (int i=0; i<60; ++i) {
mpfr_t mp_testCoefs[24];
for (int i=0; i<24; ++i) {
mpfr_init_set_d (mp_testCoefs[i], testCoefs[i],
(i%2)? MPFR_RNDU : MPFR_RNDD);
}
@ -45,7 +34,7 @@ int main(int argc, char const *argv[]) {
mpfr_init_set_d (mp_y0R, y0R, MPFR_RNDN);
mpfr_init_set_d (mp_y0I, y0I, MPFR_RNDN);
mpfr_t *mp_rop = homotopyPath_mp (4, mp_testCoefs, mp_y0R, mp_y0I, 5300);
mpfr_t *mp_rop = homotopyPath_mp (2, mp_testCoefs, mp_y0R, mp_y0I, 106);
int size = mpfr_get_si (mp_rop[0], MPFR_RNDN);
@ -54,7 +43,7 @@ int main(int argc, char const *argv[]) {
delete [] mp_rop;
for (int i=0; i<60; ++i) {
for (int i=0; i<24; ++i) {
mpfr_clear (mp_testCoefs[i]);
}