annotate src/of-lssa-1-fixes.patch @ 4198:2f1d93109f43

temporary fixes for of-lssa package
author John W. Eaton <jwe@octave.org>
date Wed, 31 Aug 2016 15:01:40 -0400
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4198
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 # HG changeset patch
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 # User John Donoghue
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 # Date 1467900324 14400
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 # Thu Jul 07 10:05:24 2016 -0400
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 # Node ID 59af0bcd5cafce29162db3dfc42dcf326f56d8be
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 # Parent 3727b85ea021033ee96fb0b017eefb73fb2f7c35
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Use complex real/imag set method to assign values (Bug #48424)
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 * src/fastlscomplex.cc
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 (flscomplex): Use record_current, record_next real/imag set method to assign +/- values
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 diff --git a/src/fastlscomplex.cc b/src/fastlscomplex.cc
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 --- a/src/fastlscomplex.cc
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 +++ b/src/fastlscomplex.cc
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 @@ -372,8 +372,10 @@ bool flscomplex (const RowVector & tvec,
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 --tpra;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 h = *tpra * *exp_ptr;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 - record_current->power_series[p].real() -= h.imag();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 - record_current->power_series[p].imag() += h.real();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 + record_current->power_series[p].real (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 + record_current->power_series[p].real() - h.imag());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 + record_current->power_series[p].imag (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 + record_current->power_series[p].imag() + h.real());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 if (++exp_ptr >= exp_pse_ptr )
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 break;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 @@ -386,8 +388,10 @@ bool flscomplex (const RowVector & tvec,
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 --tpra;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 h = -*tpra * *exp_ptr;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 - record_current->power_series[p].real() -= h.imag();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 - record_current->power_series[p].imag() += h.real();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 + record_current->power_series[p].real (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 + record_current->power_series[p].real() - h.imag());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 + record_current->power_series[p].imag (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 + record_current->power_series[p].imag() + h.real());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 if (++exp_ptr >= exp_pse_ptr)
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 break;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41 @@ -422,8 +426,10 @@ bool flscomplex (const RowVector & tvec,
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 tprb -= 2;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 h = *tprb * *exp_ptr;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 - record_current->power_series[p].real() -= h.imag();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 - record_current->power_series[p].imag() += h.real();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 + record_current->power_series[p].real (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 + record_current->power_series[p].real() - h.imag());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 + record_current->power_series[p].imag (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 + record_current->power_series[p].imag() + h.real());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 if ( ++exp_ptr >= exp_pse_ptr )
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 break;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 @@ -436,8 +442,10 @@ bool flscomplex (const RowVector & tvec,
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 tprb -= 2;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 h = - *tprb * *exp_ptr;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58 - record_current->power_series[p].real() -= h.imag();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 - record_current->power_series[p].imag() += h.real();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 + record_current->power_series[p].real (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 + record_current->power_series[p].real() - h.imag());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 + record_current->power_series[p].imag (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 + record_current->power_series[p].imag() + h.real());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 if (++exp_ptr >= exp_pse_ptr)
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 break;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 @@ -467,8 +475,10 @@ bool flscomplex (const RowVector & tvec,
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 --tpra;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 h = *tpra * *exp_ptr;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 - record_next->power_series[q].real() -= h.imag();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 - record_next->power_series[q].imag() += h.real();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73 + record_next->power_series[q].real (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 + record_next->power_series[q].real() - h.imag());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 + record_next->power_series[q].imag (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 + record_next->power_series[q].imag() + h.real());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 if (++exp_ptr >= exp_pse_ptr)
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 break;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80 @@ -481,8 +491,10 @@ bool flscomplex (const RowVector & tvec,
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 --tpra;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 h = -*tpra * *exp_ptr;
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 - record_next->power_series[q].real() -= h.imag();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 - record_next->power_series[q].imag() += h.real();
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86 + record_next->power_series[q].real (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87 + record_next->power_series[q].real() - h.imag());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88 + record_next->power_series[q].imag (
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89 + record_next->power_series[q].imag() + h.real());
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
90
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91 if (++exp_ptr >= exp_pse_ptr)
2f1d93109f43 temporary fixes for of-lssa package
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92 break;