sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Simplify code in patch.

Browse source
This commit is contained in:
Stephen Montgomery-Smith 2014-05-18 18:15:36 +00:00
parent d834932b47
commit a84be60ae9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=354446
1 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
math/octave-forge-lssa/files/patch-fastlscomplex.cc
View file

@ -1,74 +1,62 @@
--- fastlscomplex.cc-orig 2014-05-17 13:56:21.000000000 -0500 --- fastlscomplex.cc.orig 2012-08-16 21:00:23.000000000 +0000
+++ fastlscomplex.cc 2014-05-17 14:06:47.000000000 -0500 +++ fastlscomplex.cc 2014-05-18 17:56:32.000000000 +0000
@@ -372,8 +372,9 @@ @@ -372,8 +372,7 @@
--tpra; --tpra;
h = *tpra * *exp_ptr; h = *tpra * *exp_ptr;
- record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].real() -= h.imag();
- record_current->power_series[p].imag() += h.real(); - record_current->power_series[p].imag() += h.real();
+ // record_current->power_series[p].real() -= h.imag(); + record_current->power_series[p] += std::complex<double>(-h.imag(), h.real());
+ // record_current->power_series[p].imag() += h.real();
+ record_current->power_series[p] = std::complex<double>(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real());
if (++exp_ptr >= exp_pse_ptr ) if (++exp_ptr >= exp_pse_ptr )
break; break;
@@ -386,8 +387,9 @@ @@ -386,8 +385,7 @@
--tpra; --tpra;
h = -*tpra * *exp_ptr; h = -*tpra * *exp_ptr;
- record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].real() -= h.imag();
- record_current->power_series[p].imag() += h.real(); - record_current->power_series[p].imag() += h.real();
+ // record_current->power_series[p].real() -= h.imag(); + record_current->power_series[p] += std::complex<double>(-h.imag(), h.real());
+ // record_current->power_series[p].imag() += h.real();
+ record_current->power_series[p] = std::complex<double>(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real());
if (++exp_ptr >= exp_pse_ptr) if (++exp_ptr >= exp_pse_ptr)
break; break;
@@ -422,8 +424,9 @@ @@ -422,8 +420,7 @@
tprb -= 2; tprb -= 2;
h = *tprb * *exp_ptr; h = *tprb * *exp_ptr;
- record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].real() -= h.imag();
- record_current->power_series[p].imag() += h.real(); - record_current->power_series[p].imag() += h.real();
+ // record_current->power_series[p].real() -= h.imag(); + record_current->power_series[p] += std::complex<double>(-h.imag(), h.real());
+ // record_current->power_series[p].imag() += h.real();
+ record_current->power_series[p] = std::complex<double>(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real());
if ( ++exp_ptr >= exp_pse_ptr ) if ( ++exp_ptr >= exp_pse_ptr )
break; break;
@@ -436,8 +439,9 @@ @@ -436,8 +433,7 @@
tprb -= 2; tprb -= 2;
h = - *tprb * *exp_ptr; h = - *tprb * *exp_ptr;
- record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].real() -= h.imag();
- record_current->power_series[p].imag() += h.real(); - record_current->power_series[p].imag() += h.real();
+ // record_current->power_series[p].real() -= h.imag(); + record_current->power_series[p] += std::complex<double>(-h.imag(), h.real());
+ // record_current->power_series[p].imag() += h.real();
+ record_current->power_series[p] = std::complex<double>(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real());
if (++exp_ptr >= exp_pse_ptr) if (++exp_ptr >= exp_pse_ptr)
break; break;
@@ -467,8 +471,9 @@ @@ -467,8 +463,7 @@
--tpra; --tpra;
h = *tpra * *exp_ptr; h = *tpra * *exp_ptr;
- record_next->power_series[q].real() -= h.imag(); - record_next->power_series[q].real() -= h.imag();
- record_next->power_series[q].imag() += h.real(); - record_next->power_series[q].imag() += h.real();
+ // record_current->power_series[q].real() -= h.imag(); + record_current->power_series[q] += std::complex<double>(-h.imag(), h.real());
+ // record_current->power_series[q].imag() += h.real();
+ record_current->power_series[q] = std::complex<double>(record_current->power_series[q].real() - h.imag(), record_current->power_series[q].imag() + h.real());
if (++exp_ptr >= exp_pse_ptr) if (++exp_ptr >= exp_pse_ptr)
break; break;
@@ -481,8 +486,9 @@ @@ -481,8 +476,7 @@
--tpra; --tpra;
h = -*tpra * *exp_ptr; h = -*tpra * *exp_ptr;
- record_next->power_series[q].real() -= h.imag(); - record_next->power_series[q].real() -= h.imag();
- record_next->power_series[q].imag() += h.real(); - record_next->power_series[q].imag() += h.real();
+ // record_current->power_series[q].real() -= h.imag(); + record_current->power_series[q] += std::complex<double>(-h.imag(), h.real());
+ // record_current->power_series[q].imag() += h.real();
+ record_current->power_series[q] = std::complex<double>(record_current->power_series[q].real() - h.imag(), record_current->power_series[q].imag() + h.real());
if (++exp_ptr >= exp_pse_ptr) if (++exp_ptr >= exp_pse_ptr)
break; break;