From owner-svn-ports-all@FreeBSD.ORG Sun May 18 18:15:36 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE1E0C4E; Sun, 18 May 2014 18:15:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA35D2F3B; Sun, 18 May 2014 18:15:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4IIFa2x088048; Sun, 18 May 2014 18:15:36 GMT (envelope-from stephen@svn.freebsd.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4IIFaim088047; Sun, 18 May 2014 18:15:36 GMT (envelope-from stephen@svn.freebsd.org) Message-Id: <201405181815.s4IIFaim088047@svn.freebsd.org> From: Stephen Montgomery-Smith Date: Sun, 18 May 2014 18:15:36 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 May 2014 18:15:37 -0000 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(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real()); ++ record_current->power_series[p] += std::complex(-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(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real()); ++ record_current->power_series[p] += std::complex(-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(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real()); ++ record_current->power_series[p] += std::complex(-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(record_current->power_series[p].real() - h.imag(), record_current->power_series[p].imag() + h.real()); ++ record_current->power_series[p] += std::complex(-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(record_current->power_series[q].real() - h.imag(), record_current->power_series[q].imag() + h.real()); ++ record_current->power_series[q] += std::complex(-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(record_current->power_series[q].real() - h.imag(), record_current->power_series[q].imag() + h.real()); ++ record_current->power_series[q] += std::complex(-h.imag(), h.real()); if (++exp_ptr >= exp_pse_ptr) break;