Mercurial > mxe-octave

changeset 6071:c319371801a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-interval: update to v3.2.1 * src/of-interval.mk: update version/checksum * src/of-interval-2-subsref.patch, src/of-interval-3-error_state.patch: deleted * dist-files.mk: removed ref to deleted files
author John Donoghue <john.donoghue@ieee.org>
date Sat, 29 Jan 2022 10:31:18 -0500
parents 8d1aecf2d2d6
children 9cfc0cda57e9
files dist-files.mk src/of-interval-2-subsref.patch src/of-interval-3-error_state.patch src/of-interval.mk
diffstat 4 files changed, 2 insertions(+), 193 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed Jan 26 19:14:36 2022 +0100
+++ b/dist-files.mk	Sat Jan 29 10:31:18 2022 -0500
@@ -497,8 +497,6 @@
   of-image.mk \
   of-instrument-control.mk \
   of-interval-1-cross-fixes.patch \
-  of-interval-2-subsref.patch \
-  of-interval-3-error_state.patch \
   of-interval.mk \
   of-io-1-fixes.patch \
   of-io.mk \
--- a/src/of-interval-2-subsref.patch	Wed Jan 26 19:14:36 2022 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1608537445 -3600
-#      Mon Dec 21 08:57:25 2020 +0100
-# Node ID 9014fec674bdbac46727ca3e3f25d57bf06a2115
-# Parent  4628637d02b8327eabbe4b0716b8338096f00610
-Use "/" in names for class methods (bug #59334).
-
-* @infsup/subsref.m, @infsupdec/subsref.m: Use "/" as separator between class
-  and method name on all platforms.
-
-diff -r 4628637d02b8 -r 9014fec674bd inst/@infsup/subsref.m
---- a/inst/@infsup/subsref.m	Tue Jul 03 00:03:48 2018 +0200
-+++ b/inst/@infsup/subsref.m	Mon Dec 21 08:57:25 2020 +0100
-@@ -69,7 +69,7 @@
-       if (not (any (strcmp (S(1).subs, methods (A)))))
-         error (["interval property ‘", S(1).subs, "’ is unknown"])
-       endif
--      functionname = ["@infsup", filesep(), S(1).subs];
-+      functionname = ["@infsup/", S(1).subs];
-       if (nargin (functionname) ~= 1)
-         error (["‘", S(1).subs, "’ is not a valid interval property"])
-       endif
-diff -r 4628637d02b8 -r 9014fec674bd inst/@infsupdec/subsref.m
---- a/inst/@infsupdec/subsref.m	Tue Jul 03 00:03:48 2018 +0200
-+++ b/inst/@infsupdec/subsref.m	Mon Dec 21 08:57:25 2020 +0100
-@@ -68,9 +68,9 @@
-       error ("interval cannot be indexed with {}")
-     case "."
-       if (any (strcmp (S(1).subs, methods ("infsupdec"))))
--        functionname = ["@infsupdec", filesep(),  S(1).subs];
-+        functionname = ["@infsupdec/",  S(1).subs];
-       elseif (any (strcmp (S(1).subs, methods ("infsup"))))
--        functionname = ["@infsup", filesep(), S(1).subs];
-+        functionname = ["@infsup/", S(1).subs];
-       else
-         error (["interval property ‘", S(1).subs, "’ is unknown"])
-       endif
--- a/src/of-interval-3-error_state.patch	Wed Jan 26 19:14:36 2022 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +0,0 @@
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1637946154 -3600
-#      Fri Nov 26 18:02:34 2021 +0100
-# Node ID afe5ca3dbea5893fcc0b166a4c9e4bbaf24f18c5
-# Parent  9014fec674bdbac46727ca3e3f25d57bf06a2115
-Fix compilation with Octave 8 (bug #61568).
-
-* src/crlibm_function.cc (Fcrlibm_function), src/mpfr_function_d.cc
-(Fmpfr_function_d), src/mpfr_linspace_d.cc (Fmpfr_linspace_d),
-src/mpfr_matrix_mul_d.cc (Fmpfr_matrix_mul_d), src/mpfr_matrix_sqr_d.cc
-(Fmpfr_matrix_sqr_d), src/mpfr_to_string_d.cc (Fmpfr_to_string_d),
-src/mpfr_vector_dot_d.cc (Fmpfr_vector_dot_d), src/mpfr_vector_sum_d.cc
-(Fmpfr_vector_sum_d), src/__setround__.cc (F__setround__): Remove usage of
-`error_state`. It was unconditionally set to 0 since about 6 years ago and will
-finally be removed in Octave 8.
-
-diff -r 9014fec674bd -r afe5ca3dbea5 src/__setround__.cc
---- a/src/__setround__.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/__setround__.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -62,9 +62,6 @@
-     error ("__setround__: Unsupported rounding mode, please use -inf, +inf "
-            "or 0.5");
- 
--  if (error_state)
--    return octave_value_list ();
--
-   if (fesetround (mode) != 0)
-     error ("__setround__: Unable to change rounding mode");
- 
-diff -r 9014fec674bd -r afe5ca3dbea5 src/crlibm_function.cc
---- a/src/crlibm_function.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/crlibm_function.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -84,9 +84,6 @@
-   const double      rnd      = args(1).scalar_value ();
-   NDArray           arg1     = args(2).array_value ();
- 
--  if (error_state)
--    return octave_value_list ();
--
-   if (rnd == INFINITY)
-     {
-       // Round upwards
-diff -r 9014fec674bd -r afe5ca3dbea5 src/mpfr_function_d.cc
---- a/src/mpfr_function_d.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/mpfr_function_d.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -391,8 +391,6 @@
-       if (arg1.dims () != arg2.dims () || arg2.dims () != arg3.dims ())
-         error ("mpfr_function_d: Array dimensions must agree!");
-     }
--  if (error_state)
--    return octave_value_list ();
- 
-   // Choose the function to evaluate
-   switch (nargin - 2)
-@@ -491,8 +489,6 @@
-         else if (function == "nthroot")
-           {
-             uint64NDArray n = args (3).uint64_array_value ();
--            if (error_state)
--              return octave_value_list ();
-             nthroot (arg1, n, rnd);
-           }
-         else if (function == "plus")
-diff -r 9014fec674bd -r afe5ca3dbea5 src/mpfr_linspace_d.cc
---- a/src/mpfr_linspace_d.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/mpfr_linspace_d.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -65,8 +65,6 @@
-     error ("mpfr_linspace_d: vectors must be of equal length");
-   if (rnd != MPFR_RNDD && rnd != MPFR_RNDU)
-     error ("mpfr_linspace_d: only directed rounding supported");
--  if (error_state)
--    return octave_value_list ();
- 
-   // Result size
-   n = std::max (n, 1);
-diff -r 9014fec674bd -r afe5ca3dbea5 src/mpfr_matrix_mul_d.cc
---- a/src/mpfr_matrix_mul_d.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/mpfr_matrix_mul_d.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -137,9 +137,7 @@
-   Matrix matrix_yl = args (1).matrix_value ();
-   Matrix matrix_xu = args (2).matrix_value ();
-   Matrix matrix_yu = args (3).matrix_value ();
--  if (error_state)
--    return octave_value_list ();
--  
-+
-   std::pair <Matrix, Matrix> result_d = 
-     interval_matrix_mul (matrix_xl, matrix_yl, matrix_xu, matrix_yu);
-   octave_value_list result;
-diff -r 9014fec674bd -r afe5ca3dbea5 src/mpfr_matrix_sqr_d.cc
---- a/src/mpfr_matrix_sqr_d.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/mpfr_matrix_sqr_d.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -331,9 +331,7 @@
- 
-   Matrix matrix_xl = args (0).matrix_value ();
-   Matrix matrix_xu = args (1).matrix_value ();
--  if (error_state)
--    return octave_value_list ();
--  
-+
-   std::pair <Matrix, Matrix> result_d = 
-     interval_matrix_sqr (matrix_xl, matrix_xu);
-   octave_value_list result;
-diff -r 9014fec674bd -r afe5ca3dbea5 src/mpfr_to_string_d.cc
---- a/src/mpfr_to_string_d.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/mpfr_to_string_d.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -128,9 +128,7 @@
-     }
-   
-   const Matrix x = args (2).matrix_value ();
--  if (error_state)
--    return octave_value_list ();
--  
-+
-   char buf [768];
-   mpfr_t mp;
-   mpfr_t zero;
-diff -r 9014fec674bd -r afe5ca3dbea5 src/mpfr_vector_dot_d.cc
---- a/src/mpfr_vector_dot_d.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/mpfr_vector_dot_d.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -460,8 +460,6 @@
-           NDArray array_xu = args (2).array_value ();
-           NDArray array_yu = args (3).array_value ();
-           octave_idx_type dim = args (4).scalar_value ();
--          if (error_state)
--            return octave_value_list ();
- 
-           std::pair <NDArray, NDArray> result_d =
-               interval_vector_dot (array_xl, array_yl, array_xu, array_yu, dim);
-@@ -475,8 +473,6 @@
-           const NDArray array_x = args (1).array_value ();
-           const NDArray array_y = args (2).array_value ();
-           const octave_idx_type dim = args (3).scalar_value ();
--          if (error_state)
--            return octave_value_list ();
- 
-           std::pair <NDArray, NDArray> result_and_error
-               = vector_dot (rnd, array_x, array_y, dim, nargout >= 2);
-diff -r 9014fec674bd -r afe5ca3dbea5 src/mpfr_vector_sum_d.cc
---- a/src/mpfr_vector_sum_d.cc	Mon Dec 21 08:57:25 2020 +0100
-+++ b/src/mpfr_vector_sum_d.cc	Fri Nov 26 18:02:34 2021 +0100
-@@ -69,8 +69,6 @@
-   const mpfr_rnd_t rnd      = parse_rounding_mode (args (0).scalar_value ());
-   const NDArray    array    = args (1).array_value ();
-   const octave_idx_type dim = args (2).scalar_value ();
--  if (error_state)
--    return octave_value_list ();
- 
-   if (dim > array.ndims ())
-     {
--- a/src/of-interval.mk	Wed Jan 26 19:14:36 2022 +0100
+++ b/src/of-interval.mk	Sat Jan 29 10:31:18 2022 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-interval
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.2.0
-$(PKG)_CHECKSUM := 9890115852745616ec5ca157aec518243d5b8030
+$(PKG)_VERSION  := 3.2.1
+$(PKG)_CHECKSUM := b821e3fefef6164a018e9f85763b39f594c8382a
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := interval-$($(PKG)_VERSION)
 $(PKG)_FILE     := interval-$($(PKG)_VERSION).tar.gz