<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a6e83b384cc026e0f9963a571f25487cfb62ad49">https://github.com/macports/macports-ports/commit/a6e83b384cc026e0f9963a571f25487cfb62ad49</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a6e83b384cc octave-fl-core: fix issparse issue, add size
</span>a6e83b384cc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a6e83b384cc026e0f9963a571f25487cfb62ad49
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat Dec 19 10:54:27 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> octave-fl-core: fix issparse issue, add size
</span>---
math/octave-fl-core/Portfile | 5 +--
.../files/patch-src-fl_compose.cc.diff | 40 ++++++++++++++++++++--
2 files changed, 41 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fl-core/Portfile b/math/octave-fl-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a5b063a06d..b4b04b0220a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-fl-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fl-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,8 @@ description The package contains code for basic functions in Fuzzy Logic
</span> Octave.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 83407ab60255867d14ae1e7e844c8bee14dd4b6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5ec025ecdc05aede186fad48c28fe8053888e6571ba557a22173649f7c0c0a1d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 83407ab60255867d14ae1e7e844c8bee14dd4b6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5ec025ecdc05aede186fad48c28fe8053888e6571ba557a22173649f7c0c0a1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10357
</span>
patchfiles patch-src-fl_compose.cc.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fl-core/files/patch-src-fl_compose.cc.diff b/math/octave-fl-core/files/patch-src-fl_compose.cc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 76e336eee99..b8d82184f81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-fl-core/files/patch-src-fl_compose.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fl-core/files/patch-src-fl_compose.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fl_compose.cc.orig 2011-02-06 12:09:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fl_compose.cc 2018-05-21 14:23:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/fl_compose.cc.orig 2020-12-19 10:40:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/fl_compose.cc 2020-12-19 10:48:55.000000000 -0600
</span> @@ -21,6 +21,7 @@
#include <octave/oct.h>
#include <octave/parse.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,15 @@
</span>
#define HELP \
"-*- texinfo -*-\n\
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Check if the matrices are both both sparse and set the output matrix to sparse type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(args(0).is_sparse_type() && args(1).is_sparse_type())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(args(0).issparse() && args(1).issparse())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sparse_res = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @@ -465,7 +466,7 @@
float tnorm_val;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,3 +26,30 @@
</span>
// Initialize the number of nonzero elements in the sparse matrix c
int nel = 0;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -621,7 +621,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_value_list testArgs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ testArgs(0) = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ testArgs(1) = 2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- feval(func,testArgs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::feval(func,testArgs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -724,7 +724,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_value_list fargs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fargs(0) = octave_value(first);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fargs(1) = octave_value(second);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return feval(tnorm,fargs)(0).float_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return octave::feval(tnorm,fargs)(0).float_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -735,7 +735,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_value_list fargs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fargs(0) = octave_value(first);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fargs(1) = octave_value(second);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return feval(snorm,fargs)(0).float_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return octave::feval(snorm,fargs)(0).float_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>