Date: Sun, 18 May 2014 18:15:36 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354446 - head/math/octave-forge-lssa/files Message-ID: <201405181815.s4IIFaim088047@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Sun May 18 18:15:36 2014 New Revision: 354446 URL: http://svnweb.freebsd.org/changeset/ports/354446 QAT: https://qat.redports.org/buildarchive/r354446/ Log: - Simplify code in patch. Modified: head/math/octave-forge-lssa/files/patch-fastlscomplex.cc Modified: head/math/octave-forge-lssa/files/patch-fastlscomplex.cc ============================================================================== --- head/math/octave-forge-lssa/files/patch-fastlscomplex.cc Sun May 18 18:13:32 2014 (r354445) +++ head/math/octave-forge-lssa/files/patch-fastlscomplex.cc Sun May 18 18:15:36 2014 (r354446) @@ -1,74 +1,62 @@ ---- fastlscomplex.cc-orig 2014-05-17 13:56:21.000000000 -0500 -+++ fastlscomplex.cc 2014-05-17 14:06:47.000000000 -0500 -@@ -372,8 +372,9 @@ +--- fastlscomplex.cc.orig 2012-08-16 21:00:23.000000000 +0000 ++++ fastlscomplex.cc 2014-05-18 17:56:32.000000000 +0000 +@@ -372,8 +372,7 @@ --tpra; h = *tpra * *exp_ptr; - record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].imag() += h.real(); -+ // record_current->power_series[p].real() -= h.imag(); -+ // 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()); ++ record_current->power_series[p] += std::complex<double>(-h.imag(), h.real()); if (++exp_ptr >= exp_pse_ptr ) break; -@@ -386,8 +387,9 @@ +@@ -386,8 +385,7 @@ --tpra; h = -*tpra * *exp_ptr; - record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].imag() += h.real(); -+ // record_current->power_series[p].real() -= h.imag(); -+ // 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()); ++ record_current->power_series[p] += std::complex<double>(-h.imag(), h.real()); if (++exp_ptr >= exp_pse_ptr) break; -@@ -422,8 +424,9 @@ +@@ -422,8 +420,7 @@ tprb -= 2; h = *tprb * *exp_ptr; - record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].imag() += h.real(); -+ // record_current->power_series[p].real() -= h.imag(); -+ // 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()); ++ record_current->power_series[p] += std::complex<double>(-h.imag(), h.real()); if ( ++exp_ptr >= exp_pse_ptr ) break; -@@ -436,8 +439,9 @@ +@@ -436,8 +433,7 @@ tprb -= 2; h = - *tprb * *exp_ptr; - record_current->power_series[p].real() -= h.imag(); - record_current->power_series[p].imag() += h.real(); -+ // record_current->power_series[p].real() -= h.imag(); -+ // 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()); ++ record_current->power_series[p] += std::complex<double>(-h.imag(), h.real()); if (++exp_ptr >= exp_pse_ptr) break; -@@ -467,8 +471,9 @@ +@@ -467,8 +463,7 @@ --tpra; h = *tpra * *exp_ptr; - record_next->power_series[q].real() -= h.imag(); - record_next->power_series[q].imag() += h.real(); -+ // record_current->power_series[q].real() -= h.imag(); -+ // 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()); ++ record_current->power_series[q] += std::complex<double>(-h.imag(), h.real()); if (++exp_ptr >= exp_pse_ptr) break; -@@ -481,8 +486,9 @@ +@@ -481,8 +476,7 @@ --tpra; h = -*tpra * *exp_ptr; - record_next->power_series[q].real() -= h.imag(); - record_next->power_series[q].imag() += h.real(); -+ // record_current->power_series[q].real() -= h.imag(); -+ // 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()); ++ record_current->power_series[q] += std::complex<double>(-h.imag(), h.real()); if (++exp_ptr >= exp_pse_ptr) break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405181815.s4IIFaim088047>