Mercurial > mxe-octave

annotate src/of-tisean-2-error_state.patch @ 7207:9ed6500e56d3 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge release to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 17 May 2024 20:16:41 +0200
parents 24d3e9a130b4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5992
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
1 # HG changeset patch
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
2 # User Markus Mützel <markus.muetzel@gmx.de>
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
3 # Date 1638190865 -3600
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
4 # Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
5 # Node ID fdca531d6a1268500b3ebefbacb97a4a44141c43
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
6 # Parent 7d4b181cd726d9ad0d6ee5a37d128d90fc925858
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
7 Remove usage of `error_state` (bug #61583).
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
8
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
9 * src/pcregexp.cc (many files): Remove usage of `error_state`. It was
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
10 unconditionally set to 0 since about 6 years ago and will finally be removed in
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
11 Octave 8.
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
12
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
13 diff -r 7d4b181cd726 -r fdca531d6a12 src/__boxcount__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
14 --- a/src/__boxcount__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
15 +++ b/src/__boxcount__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
16 @@ -194,8 +194,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
17
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
18 octave_idx_type length=LENGTH-(maxembed-1)*DELAY;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
19
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
20 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
21 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
22 // Calculate output
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
23 double heps = EPSMAX*EPSFAKTOR;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
24 octave_idx_type epsi_old = 0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
25 @@ -276,7 +274,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
26
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
27
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
28 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
29 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
30 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
31 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
32 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
33 diff -r 7d4b181cd726 -r fdca531d6a12 src/__c1__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
34 --- a/src/__c1__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
35 +++ b/src/__c1__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
36 @@ -77,10 +77,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
37 bool verbose = args(9).bool_value ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
38 octave_idx_type iverb = verbose;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
39
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
40 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
41 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
42 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
43 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
44 octave_idx_type lines_read = input.rows (); //nmax in d1()
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
45 octave_idx_type columns_read = input.columns ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
46
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
47 @@ -136,7 +132,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
48 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
49
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
50 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
51 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
52 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
53 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
54 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
55 diff -r 7d4b181cd726 -r fdca531d6a12 src/__d2__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
56 --- a/src/__d2__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
57 +++ b/src/__d2__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
58 @@ -365,9 +365,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
59 time_t lasttime;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
60 time(&lasttime);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
61
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
62 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
63 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
64 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
65 bool imin_too_large = false;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
66 bool pause_calc = false;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
67 // Calculate the outputs
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
68 @@ -608,7 +605,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
69 // Assign outputs
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
70 retval(0) = values;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
71 retval(1) = vars;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
72 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
73
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
74 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
75 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
76 diff -r 7d4b181cd726 -r fdca531d6a12 src/__delay__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
77 --- a/src/__delay__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
78 +++ b/src/__delay__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
79 @@ -60,8 +60,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
80
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
81 OCTAVE_LOCAL_BUFFER (octave_idx_type, inddelay, alldim);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
82
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
83 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
84 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
85 octave_idx_type rundel=0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
86 octave_idx_type runmdel=0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
87
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
88 @@ -108,7 +106,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
89 // previously fprintf(stdout,"\n");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
90 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
91 retval(0) = series;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
92 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
93
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
94 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
95 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
96 diff -r 7d4b181cd726 -r fdca531d6a12 src/__false_nearest__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
97 --- a/src/__false_nearest__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
98 +++ b/src/__false_nearest__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
99 @@ -179,8 +179,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
100 check_alloc(vcomp=(unsigned int*)malloc(sizeof(int)*(maxdim)));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
101 check_alloc(vemb=(unsigned int*)malloc(sizeof(int)*(maxdim)));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
102
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
103 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
104 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
105 for (i=0;i<maxdim;i++) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
106 if (comp == 1) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
107 vcomp[i]=0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
108 @@ -250,7 +248,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
109
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
110 for (i = 0; i < 4; i++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
111 retval(i) = output.column(i);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
112 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
113 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
114 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
115 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
116 diff -r 7d4b181cd726 -r fdca531d6a12 src/__ghkss__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
117 --- a/src/__ghkss__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
118 +++ b/src/__ghkss__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
119 @@ -203,8 +203,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
120
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
121 OCTAVE_LOCAL_BUFFER (double, hav, comp);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
122 OCTAVE_LOCAL_BUFFER (double, hsigma, comp);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
123 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
124 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
125 for (j=0;j<comp;j++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
126 hav[j]=hsigma[j]=0.0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
127
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
128 @@ -238,7 +236,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
129 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
130
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
131 resize_eps=0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
132 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
133 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
134
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
135 DEFUN_DLD (__ghkss__, args, , HELPTEXT)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
136 @@ -338,9 +335,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
137 mat[i]=(double*)(matarray+dim*i);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
138 check_alloc(hser=(double**)malloc(sizeof(double*)*comp));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
139
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
140 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
141 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
142 - // Create output matrix
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
143 Matrix output (length, comp);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
144
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
145 for (i=0;i<dim;i++) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
146 @@ -423,7 +417,7 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
147 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
148 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
149 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
150 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
151 +
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
152 // Deallocate of all the memory
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
153 delete[] d_min;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
154 delete[] d_max;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
155 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lfo_ar__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
156 --- a/src/__lfo_ar__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
157 +++ b/src/__lfo_ar__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
158 @@ -168,12 +168,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
159 Matrix solved_vec = mat.solve(vec);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
160 double *solved_vec_arr = solved_vec.fortran_vec ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
161
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
162 - // If errors were raised, there is no sense in countinueing
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
163 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
164 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
165 - return ;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
166 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
167 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
168 double cast=foreav[i];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
169 for (octave_idx_type j=0;j<dim;j++) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
170
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
171 @@ -262,9 +256,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
172
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
173 octave_idx_type clength=(CLENGTH <= LENGTH) ? CLENGTH-STEP : LENGTH-STEP;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
174
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
175 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
176 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
177 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
178 // Promote warnings connected with singular matrixes to errors
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
179 set_warning_state ("Octave:nearly-singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
180 set_warning_state ("Octave:singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
181 @@ -313,11 +304,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
182 make_fit (series, found, error_array,
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
183 i,dim, embed, delay, STEP, actfound);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
184 // Checking if the fit was correct
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
185 - // If any errors were raised: end function
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
186 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
187 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
188 - return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
189 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
190 pfound++;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
191 avfound += (double)(actfound-1);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
192 for (octave_idx_type j=0;j<dim;j++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
193 @@ -365,7 +351,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
194 output.resize (count, dim + 4);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
195
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
196 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
197 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
198 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
199 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
200 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
201 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lfo_run__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
202 --- a/src/__lfo_run__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
203 +++ b/src/__lfo_run__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
204 @@ -226,13 +226,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
205 Matrix solved_vec = mat.solve (vec);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
206 double *solved_vec_arr = solved_vec.fortran_vec ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
207
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
208 - // If errors were raised (a singular matrix was encountered),
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
209 - // there is no sense in countinuing
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
210 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
211 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
212 - return ;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
213 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
214 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
215 newcast[i]=foreav[i];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
216 for (octave_idx_type j=0;j<dim;j++) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
217 for (octave_idx_type j1=0;j1<embed;j1++) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
218 @@ -330,9 +323,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
219 for (octave_idx_type i=0;i<hdim;i++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
220 cast[i][j]=series[j][LENGTH-hdim+i];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
221
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
222 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
223 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
224 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
225 // Promote warnings connected with singular matrixes to errors
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
226 set_warning_state ("Octave:nearly-singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
227 set_warning_state ("Octave:singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
228 @@ -377,12 +367,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
229 make_zeroth(series, found, dim, actfound,newcast);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
230
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
231 // Checking if the fit was correct
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
232 - // If any errors were raised: end function
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
233 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
234 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
235 - return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
236 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
237 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
238 for (octave_idx_type j=0;j<dim;j++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
239 {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
240 // old printf("%e ",newcast[j]*interval[j]+min_array[j]);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
241 @@ -410,7 +394,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
242 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
243 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
244 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
245 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
246 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
247 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
248 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
249 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lfo_test__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
250 --- a/src/__lfo_test__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
251 +++ b/src/__lfo_test__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
252 @@ -212,13 +212,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
253 Matrix solved_vec = mat.solve (vec);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
254 double *solved_vec_arr = solved_vec.fortran_vec ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
255
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
256 - // If errors were raised (a singular matrix was encountered),
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
257 - // there is no sense in countinueing
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
258 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
259 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
260 - return ;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
261 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
262 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
263 newcast[i]=foreav[i];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
264 for (octave_idx_type j=0;j<DIM;j++) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
265 octave_idx_type hcj=indexes[0][j];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
266 @@ -332,9 +325,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
267 for (octave_idx_type i=0;i<COMP;i++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
268 error_array[i]=0.0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
269
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
270 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
271 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
272 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
273 // Promote warnings connected with singular matrixes to errors
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
274 set_warning_state ("Octave:nearly-singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
275 set_warning_state ("Octave:singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
276 @@ -375,11 +365,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
277 make_fit(series, indexes, found, STEP, DIM, COMP,
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
278 actfound,i,newcast);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
279 // Checking if the fit was correct
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
280 - // If any errors were raised: end function
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
281 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
282 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
283 - return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
284 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
285 for (octave_idx_type j=0;j<COMP;j++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
286 error_array[j] += sqr(newcast[j]-series[j][i+STEP]);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
287
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
288 @@ -415,7 +400,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
289
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
290 retval(0) = rel;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
291 retval(1) = ind;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
292 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
293 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
294 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
295 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
296 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lyap_k__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
297 --- a/src/__lyap_k__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
298 +++ b/src/__lyap_k__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
299 @@ -211,8 +211,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
300 eps_fak=pow(epsmax/epsmin,1.0/(double)(epscount-1));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
301
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
302
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
303 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
304 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
305 // Calculate exponents
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
306 dim_vector dv (epscount ,((int)maxdim-(int)mindim + 1));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
307 string_vector keys;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
308 @@ -274,7 +272,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
309 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
310 // Assign output
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
311 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
312 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
313 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
314 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
315 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
316 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lyap_r__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
317 --- a/src/__lyap_r__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
318 +++ b/src/__lyap_r__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
319 @@ -167,9 +167,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
320 octave_idx_type maxlength=length-delay*(dim-1)-steps-1-mindist;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
321 bool alldone=0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
322
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
323 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
324 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
325 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
326 // Calculate the maximum epsilon that makes sense
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
327 // On the basis of 'i' and 'j' from put_in_boxes ()
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
328 NDArray input_max = input.max ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
329 @@ -224,7 +221,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
330
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
331 // Assign output
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
332 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
333 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
334 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
335 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
336 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
337 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lyap_spec__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
338 --- a/src/__lyap_spec__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
339 +++ b/src/__lyap_spec__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
340 @@ -220,13 +220,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
341 Matrix solved = mat.solve (vec);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
342 double *solved_arr = solved.fortran_vec ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
343
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
344 - // If errors were raised (a singular matrix was encountered),
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
345 - // there is no sense in countinuing
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
346 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
347 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
348 - return ;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
349 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
350 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
351 double new_vec = solved_arr[0];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
352 for (octave_idx_type i=1;i<=alldim;i++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
353 dynamics[d][i-1] = solved_arr[i];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
354 @@ -419,9 +412,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
355 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
356 // end old indexes = make_multi_index();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
357
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
358 - if (!error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
359 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
360 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
361 // Promote warnings connected with singular matrixes to errors
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
362 set_warning_state ("Octave:nearly-singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
363 set_warning_state ("Octave:singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
364 @@ -463,13 +453,7 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
365 make_dynamics(series, box, indexes, epsmin, epsset, EPSSTEP,
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
366 EMBED, MINNEIGHBORS, LENGTH, DIMENSION, count,
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
367 avneig, aveps, dynamics, averr, i);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
368 - // If there was an error
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
369 - // (matrix singularity or not enough neighbors)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
370 - // No sense continuing
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
371 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
372 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
373 - return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
374 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
375 +
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
376 make_iteration(DIMENSION, alldim, dynamics, delta);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
377 gram_schmidt(alldim, delta,lfactor);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
378 for (octave_idx_type j=0;j<alldim;j++) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
379 @@ -562,7 +546,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
380 retval(0) = lyap_exp;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
381 retval(1) = pars;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
382 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
383 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
384 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
385 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
386 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
387 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lzo_gm__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
388 --- a/src/__lzo_gm__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
389 +++ b/src/__lzo_gm__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
390 @@ -110,8 +110,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
391
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
392 MArray<octave_idx_type> box (dim_vector(NMAX,NMAX));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
393
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
394 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
395 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
396 // Estimate maximum possible output size
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
397 octave_idx_type output_rows = (octave_idx_type)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
398 ((log(EPS1) - log(EPS0)) / log (EPSF));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
399 @@ -194,8 +192,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
400 output.resize (count, dim + 4);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
401
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
402 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
403 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
404 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
405 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
406 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
407 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
408 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lzo_run__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
409 --- a/src/__lzo_run__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
410 +++ b/src/__lzo_run__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
411 @@ -209,8 +209,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
412
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
413 MArray<octave_idx_type> box (dim_vector(NMAX,NMAX));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
414
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
415 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
416 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
417 for (octave_idx_type j=0;j<dim;j++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
418 for (octave_idx_type i=0;i<hdim;i++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
419 cast[i][j]=input(LENGTH-hdim+i,j);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
420 @@ -292,7 +290,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
421 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
422 else
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
423 retval(0) = Matrix (0,0);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
424 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
425 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
426 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
427 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
428 diff -r 7d4b181cd726 -r fdca531d6a12 src/__lzo_test__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
429 --- a/src/__lzo_test__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
430 +++ b/src/__lzo_test__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
431 @@ -150,8 +150,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
432 MArray<octave_idx_type> box (dim_vector(NMAX, NMAX));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
433
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
434 // Compute forecast error
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
435 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
436 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
437 for (octave_idx_type i=0;i<LENGTH;i++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
438 done[i]=0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
439
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
440 @@ -236,7 +234,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
441
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
442 retval(0) = rel_forecast_err;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
443 retval(1) = ind_forecast_err;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
444 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
445 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
446 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
447 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
448 diff -r 7d4b181cd726 -r fdca531d6a12 src/__poincare__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
449 --- a/src/__poincare__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
450 +++ b/src/__poincare__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
451 @@ -129,8 +129,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
452
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
453
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
454
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
455 - if ( ! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
456 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
457 Matrix output (out_size, embdim);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
458
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
459 octave_idx_type count = poincare (input.fortran_vec(),
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
460 @@ -141,7 +139,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
461 output.resize (count, embdim);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
462
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
463 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
464 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
465 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
466 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
467 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
468 diff -r 7d4b181cd726 -r fdca531d6a12 src/__polynom__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
469 --- a/src/__polynom__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
470 +++ b/src/__polynom__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
471 @@ -222,8 +222,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
472 make_coding(coding_vec,N,N,DIM-1,1,0);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
473 octave_idx_type *coding = coding_vec.data();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
474
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
475 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
476 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
477 // Promote warnings connected with singular matrixes to errors
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
478 set_warning_state ("Octave:nearly-singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
479 set_warning_state ("Octave:singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
480 @@ -232,12 +230,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
481 make_fit (series, coding, results, INSAMPLE, N, DIM, DELAY,
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
482 maxencode, pars);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
483
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
484 - // If error encountered during the fit there is no sense to continue
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
485 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
486 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
487 - return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
488 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
489 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
490 // Create outputs
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
491
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
492 // Create output that contains the number of free parameters
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
493 @@ -303,7 +295,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
494 retval(2) = coeffs;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
495 retval(3) = sample_err;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
496 retval(4) = forecast;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
497 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
498 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
499 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
500 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
501 diff -r 7d4b181cd726 -r fdca531d6a12 src/__rbf__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
502 --- a/src/__rbf__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
503 +++ b/src/__rbf__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
504 @@ -152,9 +152,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
505 for (octave_idx_type j=0;j<DIM;j++)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
506 center[i][j]=series[(DIM-1)*DELAY-j*DELAY+(i*cstep)/(CENTER-1)];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
507
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
508 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
509 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
510 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
511 // Promote warnings connected with singular matrixes to errors
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
512 set_warning_state ("Octave:nearly-singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
513 set_warning_state ("Octave:singular-matrix","error");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
514 @@ -207,10 +204,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
515 coefs = mat.solve(coefs);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
516 coefs_arr = coefs.fortran_vec ();// coefs takes up new memory space
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
517
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
518 - // If solving the matrix generated errors do not continue
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
519 - if (error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
520 - return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
521 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
522 // end make_fit()
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
523
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
524
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
525 @@ -314,7 +307,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
526 retval(2) = coeff;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
527 retval(3) = sample_error; // sample error [in sample; out of sample];
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
528 retval(4) = forecast; // forecast values;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
529 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
530 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
531 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
532 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
533 diff -r 7d4b181cd726 -r fdca531d6a12 src/__surrogates__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
534 --- a/src/__surrogates__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
535 +++ b/src/__surrogates__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
536 @@ -63,9 +63,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
537 octave_idx_type ispec = args(3).idx_type_value ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
538 double seed = args(4).double_value ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
539
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
540 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
541 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
542 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
543 octave_idx_type nmaxp = input.rows ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
544 octave_idx_type mcmax = input.columns ();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
545
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
546 @@ -90,8 +87,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
547
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
548 retval(0) = surro_data;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
549 retval(1) = pars;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
550 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
551 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
552 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
553 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
554 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
555 diff -r 7d4b181cd726 -r fdca531d6a12 src/__upo__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
556 --- a/src/__upo__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
557 +++ b/src/__upo__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
558 @@ -74,10 +74,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
559 int icen = args(9).int_value();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
560
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
561
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
562 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
563 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
564 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
565 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
566 int lines_read = in_out1.numel();
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
567 // Generating output vectors with estimated lengths
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
568 // The extra length (+1) is to store the actual lengths
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
569 @@ -98,7 +94,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
570 retval(1) = orbit_data;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
571 retval(2) = acc;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
572 retval(3) = stability;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
573 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
574 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
575 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
576 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
577 diff -r 7d4b181cd726 -r fdca531d6a12 src/__xzero__.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
578 --- a/src/__xzero__.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
579 +++ b/src/__xzero__.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
580 @@ -111,8 +111,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
581 double epsilon=EPS0/EPSF;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
582 octave_idx_type clength=(CLENGTH <= LENGTH) ? CLENGTH-STEP : LENGTH-STEP;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
583
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
584 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
585 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
586 // Calculate fit
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
587 while (!alldone) {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
588 alldone=1;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
589 @@ -142,8 +140,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
590 output(i,0) = sqrt(error_array[i]/(clength-(DIM-1)*DELAY))/rms2;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
591 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
592 retval(0) = output;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
593 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
594 -
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
595 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
596 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
597 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
598 diff -r 7d4b181cd726 -r fdca531d6a12 src/lazy.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
599 --- a/src/lazy.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
600 +++ b/src/lazy.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
601 @@ -133,8 +133,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
602 "Number of iterations (IMAX) must be a positive "
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
603 "integer");
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
604
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
605 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
606 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
607 // If vector is in 1 row: transpose (we will transpose the output to fit)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
608 transposed = 0;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
609
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
610 @@ -160,7 +158,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
611
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
612 retval(0) = in_out1;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
613 retval(1) = in_out2;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
614 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
615 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
616 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
617 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
618 diff -r 7d4b181cd726 -r fdca531d6a12 src/mutual.cc
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
619 --- a/src/mutual.cc Mon Nov 29 13:49:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
620 +++ b/src/mutual.cc Mon Nov 29 14:01:05 2021 +0100
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
621 @@ -193,8 +193,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
622 int32NDArray h2 (dim_vector(partitions, partitions));
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
623 OCTAVE_LOCAL_BUFFER (long, array, length);
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
624
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
625 - if (! error_state)
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
626 - {
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
627 // Load array
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
628
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
629 // Rescale data and load array
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
630 @@ -246,7 +244,6 @@
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
631 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
632 retval(0) = delay;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
633 retval(1) = mutual_inf;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
634 - }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
635 }
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
636 return retval;
24d3e9a130b4 of-tisean: Fix for Octave 8 (bug #61583).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff changeset
637 }