p1788 0.1.0 → 1.0.0

data/ext/p1788/p1788.hh

@@ -0,0 +1,102 @@
+/* Copyright (C) 2022 Théotime Bollengier <theotime.bollengier@ensta-bretagne.fr>
+ *
+ * This file is part of P1788. <https://gitlab.ensta-bretagne.fr/bollenth/p1788>
+ *
+ * P1788 is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * P1788 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with P1788. If not, see <https://www.gnu.org/licenses/>. 
+ */
+
+#ifndef P1788_HH
+#define P1788_HH
+
+#include <ruby.h>
+#include <vector>
+#include <string>
+#include <p1788/p1788.hpp>
+
+using Interval = p1788::infsup::interval<double, p1788::flavor::infsup::setbased::mpfr_bin_ieee754_flavor>;
+using IntervalVector = std::vector<Interval>;
+
+extern VALUE m_P1788;
+extern VALUE c_Interval;
+extern VALUE c_IntervalVector;
+extern VALUE c_Figure;
+
+extern const rb_data_type_t p1788_interval_type;
+extern const rb_data_type_t p1788_vector_type;
+
+
+extern ID id_to_s;
+extern ID id_to_f;
+extern ID id_to_i;
+extern ID id_match;
+extern ID id_brackets;
+extern ID id_eqeq;
+extern ID id_inspect;
+extern ID id_join;
+extern ID id_undefined;
+extern ID id_both_empty;
+extern ID id_first_empty;
+extern ID id_second_empty;
+extern ID id_before;
+extern ID id_meets;
+extern ID id_overlaps;
+extern ID id_starts;
+extern ID id_contained_by;
+extern ID id_finishes;
+extern ID id_equal;
+extern ID id_finished_by;
+extern ID id_contains;
+extern ID id_started_by;
+extern ID id_overlapped_by;
+extern ID id_met_by;
+extern ID id_after;
+
+
+#define P1788_NEW_RB_INTERVAL(new_rb_obj, ...)                                       \
+	do {                                                                                    \
+		Interval *isdp_ = new Interval(__VA_ARGS__);                                \
+ 	 	new_rb_obj = TypedData_Wrap_Struct(c_Interval, &p1788_interval_type, isdp_); \
+	} while (0)
+
+
+inline Interval& p1788_interval_rb2ref(VALUE obj) {
+	Interval *i;
+	TypedData_Get_Struct(obj, Interval, &p1788_interval_type, i);
+	return *i;
+}
+
+
+inline IntervalVector& p1788_vector_rb2ref(VALUE obj) {
+	IntervalVector *v;
+	TypedData_Get_Struct(obj, IntervalVector, &p1788_vector_type, v);
+	return *v;
+}
+
+
+inline VALUE p1788_vector_alloc_from_pointer(IntervalVector *p) {
+	return TypedData_Wrap_Struct(c_IntervalVector, &p1788_vector_type, p);
+}
+
+
+inline bool is_an_interval_vector(VALUE obj) {
+	return (rb_class_of(obj) == c_IntervalVector);
+}
+
+
+Interval p1788_rbobj2interval(VALUE obj);
+
+void Init_p1788_figure();
+
+
+#endif /* P1788_HH */

data/lib/p1788/version.rb

@@ -1,4 +1,4 @@
 module P1788
 	# Version of the P1788 gem
-	VERSION = '0.1.0'
+	VERSION = '1.0.0'
 end

data/lib/p1788.rb

@@ -1,24 +1,19 @@
+# Copyright (C) 2022 Théotime Bollengier <theotime.bollengier@ensta-bretagne.fr>
 #
-#                              P1788
+# This file is part of P1788. <https://gitlab.ensta-bretagne.fr/bollenth/p1788>
 #
-#   A Ruby extension wrapping the C++ libieeep1788 interval arithmetic library.
+# P1788 is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License,
+# or (at your option) any later version.
 #
-#   Copyright 2022
+# P1788 is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
 #
-#   Théotime Bollengier (theotime.bollengier@ensta-bretagne.fr)
-#   ENSTA Bretagne, France
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
+# You should have received a copy of the GNU General Public License
+# along with P1788. If not, see <https://www.gnu.org/licenses/>. 
 
 require_relative 'p1788/p1788'
 require_relative 'p1788/version.rb'

data/p1788.gemspec

@@ -3,10 +3,10 @@ require File.expand_path('../lib/p1788/version.rb', __FILE__)
 Gem::Specification.new do |s|
 	s.name = 'p1788'
 	s.version = P1788::VERSION
-	s.date = '2022-01-07'
+	s.date = '2022-01-27'
 	s.summary = 'P1788 is an interval arithmetic library'
 	s.description = 'P1788 is a Ruby C extension wrapping the libieeep1788 interval arithmetic library.'
-	s.license = 'Apache-2.0'
+	s.license = 'GPL-3.0+'
 	s.authors = ['Théotime Bollengier']
 	s.email = 'theotime.bollengier@ensta-bretagne.fr'
 	s.homepage = 'https://gitlab.ensta-bretagne.fr/bollenth/p1788'
@@ -14,7 +14,6 @@ Gem::Specification.new do |s|
 	s.files = [
 		'LICENSE',
 		'NOTICE',
-		'AUTHORS',
 		'README.md',
 		'p1788.gemspec',
 		'.yardopts',
@@ -22,6 +21,10 @@ Gem::Specification.new do |s|
 		'lib/p1788/version.rb',
 		'ext/p1788/extconf.rb',
 		'ext/p1788/p1788.cc',
+		'ext/p1788/p1788.hh',
+		'ext/p1788/figure.cc',
+		'ext/p1788/figure.hh',
+		'ext/p1788/figure_wrapper.cc',
 		'ext/libieeep1788_copy/README',
 		'ext/libieeep1788_copy/p1788/LICENSE',
 		'ext/libieeep1788_copy/p1788/NOTICE',
@@ -66,7 +69,9 @@ Gem::Specification.new do |s|
 		'ext/libieeep1788_copy/p1788/util/mixed_type_traits.hpp',
 		'ext/libieeep1788_copy/p1788/util/mpfr_util.hpp',
 		'ext/libieeep1788_copy/p1788/util/mpfr_var.hpp',
-		'ext/libieeep1788_copy/p1788/util/mpfr_var_impl.hpp'
+		'ext/libieeep1788_copy/p1788/util/mpfr_var_impl.hpp',
+		'samples/figure.rb',
+		'samples/sivia.rb'
 	]
 end
 

data/samples/figure.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require 'p1788'
+include P1788
+
+nbbox = 100
+x = IntervalVector.new(nbbox){|i| 2*Interval[i.to_f/nbbox, (i+1.0)/nbbox]-1}
+b = x.map{|ix| IntervalVector[ix, ix**2]}
+c = x.map{|ix| IntervalVector[ix, sqrt(ix)]}
+
+f = Figure.new
+f.background_color = 'W'
+f.width = 720
+f.xlabel = "Horizontal axis label"
+f.ylabel = "Vertical axis label"
+f.title = "Lorem ipsum title"
+f.draw_boxes(b, 'k[g]')
+f.draw_boxes(c, 'k[R]')
+pp f.nice_range
+f.write 'fig.png'
+f.write 'fig.svg'
+f.write 'fig.pdf'
+

data/samples/sivia.rb

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+
+require 'p1788'
+include P1788
+
+def sivia(initial_box, epsilon, &test)
+	l = [initial_box]
+	x_in = []
+	x_on = []
+	x_out = []
+	until l.empty? do 
+		b = l.pop
+		case test.call(b)
+		when true
+			x_in << b
+		when false
+			x_out << b
+		else
+			if b.max_width <= epsilon then
+				x_on << b
+			else
+				l += b.bisect
+			end
+		end
+	end
+	return [x_in, x_on, x_out]
+end
+
+
+################################################################################
+
+ib = IntervalVector[-1.5..1.5, -1.5 .. 1.5]
+
+bin, bon, bout = sivia(ib, 0.025) do |b|
+	(b[0]**2 + b[1]**2).sqrt.inclusion_test(0.7..1)
+end
+
+f = Figure.new
+f.width = 512
+f.xrange = ib.first
+f.yrange = ib.last
+f.draw_boxes(bout, 'w')
+f.draw_boxes(bin, 'k[g]')
+f.draw_boxes(bon, 'k[y]')
+f.write_png 'donut.png'
+
+################################################################################
+
+ib = IntervalVector[[-2, 2], [-2, 2]]
+
+bin, bon, bout = sivia(ib, 0.05) do |b|
+	((b[0]-0.4)**5 + (b[1] - 0.3)**5).inclusion_test(1..2)
+end
+
+f = Figure.new
+f.width = 512
+f.xrange = ib.first
+f.yrange = ib.last
+f.draw_boxes(bout, 'w')
+f.draw_boxes(bin, 'k[g]')
+f.draw_boxes(bon, 'k[y]')
+f.write_png 'pow5.png'
+
+################################################################################
+
+ib = IntervalVector[-3..3, -3..3]
+dstbox = IntervalVector[[-4, -2], [4, 9], [7, 11]]
+y = IntervalVector.new(3)
+
+bin, bon, bout = sivia(ib, 0.04) do |b|
+	[-1, 1, 2].each_with_index do |t, i|
+		y[i] = (t*b[0])**2 + t*b[1]**2 + sin(b[0] + t*b[1])
+	end
+	y.inclusion_test(dstbox)
+end
+
+f = Figure.new
+f.width = 512
+f.xrange = ib.first
+f.yrange = ib.last
+f.draw_boxes(bout, 'w')
+f.draw_boxes(bin, 'k[g]')
+f.draw_boxes(bon, 'k[y]')
+f.write_png 'smiley.png'
+
+################################################################################
+
+ib = IntervalVector[[-0.5, 3], [-3, 0.5]]
+l = 0.2
+
+bin, bon, bout = sivia(ib, 0.02) do |b|
+	(exp(b[0]*b[1]) - sin(b[0]-b[1])).inclusion_test(-l..l)
+end
+
+f = Figure.new
+f.width = 512
+f.set_range ib
+f.draw_boxes(bout, 'w')
+f.draw_boxes(bin, 'k[g]')
+f.draw_boxes(bon, 'k[y]')
+f.write_png 'expsin.png'
+
+################################################################################
+
+ib = IntervalVector[[-6, 2], [-3, 3]]
+dsti = Interval[0.325, Float::INFINITY]
+
+bin, bon, bout = sivia(ib, 0.05) do |b|
+	(sin(b[0]**2 + b[1]**2) / (exp(b[0]) + b[1]**2)).inclusion_test(dsti)
+end
+
+f = Figure.new
+f.width = 512
+f.set_range ib
+f.draw_boxes(bout, 'w')
+f.draw_boxes(bin, 'k[g]')
+f.draw_boxes(bon, 'k[y]')
+f.write_png 'sinexp.png'
+puts f.allocated_size
+f.reset!
+puts f.allocated_size
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: p1788
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Théotime Bollengier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-27 00:00:00.000000000 Z
 dependencies: []
 description: P1788 is a Ruby C extension wrapping the libieeep1788 interval arithmetic
   library.
@@ -19,7 +19,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".yardopts"
-- AUTHORS
 - LICENSE
 - NOTICE
 - README.md
@@ -69,13 +68,19 @@ files:
 - ext/libieeep1788_copy/p1788/util/mpfr_var_impl.hpp
 - ext/libieeep1788_copy/p1788/version.hpp
 - ext/p1788/extconf.rb
+- ext/p1788/figure.cc
+- ext/p1788/figure.hh
+- ext/p1788/figure_wrapper.cc
 - ext/p1788/p1788.cc
+- ext/p1788/p1788.hh
 - lib/p1788.rb
 - lib/p1788/version.rb
 - p1788.gemspec
+- samples/figure.rb
+- samples/sivia.rb
 homepage: https://gitlab.ensta-bretagne.fr/bollenth/p1788
 licenses:
-- Apache-2.0
+- GPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/AUTHORS

@@ -1,6 +0,0 @@
-== AUTHOR ==
-
-  Théotime Bollengier (theotime.bollengier@ensta-bretagne.fr)
-    ENSTA Bretagne engineering school and research institute, France
-    https://gitlab.ensta-bretagne.fr/bollenth
-