jsxgraph 1.10.0 → 1.10.1

package/src/math/geometry.js

@@ -3143,7 +3143,6 @@ JXG.extend(
                 t = Type.evaluate(curve.visProp.curvetype) === 'functiongraph' ? x : 0.0;
             }
             result = this.projectCoordsToCurve(x, y, t, curve, board);
-
             // point.position = result[1];
 
             return result;
@@ -3167,7 +3166,8 @@ JXG.extend(
                 i, j, mindist, dist, lbda,
                 v, coords, d, p1, p2, res, minfunc,
                 t_new, f_new, f_old, dy,
-                delta, delta1, delta2, steps, minX, maxX,
+                delta, delta1, delta2, steps,
+                minX, maxX, minX_glob, maxX_glob,
                 infty = Number.POSITIVE_INFINITY;
 
             if (!Type.exists(board)) {
@@ -3232,24 +3232,31 @@ JXG.extend(
             } else {
                 // 'parameter', 'polar', 'functiongraph'
 
+                minX_glob = curve.minX();
+                maxX_glob = curve.maxX();
+                minX = minX_glob;
+                maxX = maxX_glob;
+
                 if (Type.evaluate(curve.visProp.curvetype) === 'functiongraph') {
+                    // Restrict the possible position of t
+                    // to the projection of a circle to the x-axis (= t-axis)
                     dy = Math.abs(y - curve.Y(x));
                     if (!isNaN(dy)) {
                         minX = x - dy;
                         maxX = x + dy;
-                    } else {
-                        minX = curve.minX();
-                        maxX = curve.maxX();
                     }
-                } else {
-                    minX = curve.minX();
-                    maxX = curve.maxX();
                 }
 
-                /** @ignore */
+                /**
+                 * @ignore
+                 * Find t such that the Euclidean distance between
+                 * [x, y] and [curve.X(t), curve.Y(t)]
+                 * is minimized.
+                 */
                 minfunc = function (t) {
                     var dx, dy;
-                    if (t < curve.minX() || t > curve.maxX()) {
+
+                    if (t < minX_glob || t > curve.maxX_glob) {
                         return Infinity;
                     }
                     dx = x - curve.X(t);
@@ -3257,12 +3264,12 @@ JXG.extend(
                     return dx * dx + dy * dy;
                 };
 
+                // Search t which minimizes minfunc(t)
+                // in discrete steps
                 f_old = minfunc(t);
                 steps = 50;
-
                 delta = (maxX - minX) / steps;
                 t_new = minX;
-
                 for (i = 0; i < steps; i++) {
                     f_new = minfunc(t_new);
 
@@ -3275,24 +3282,21 @@ JXG.extend(
                 }
 
                 // t = Numerics.root(Numerics.D(minfunc), t);
+
                 // Ensure that minfunc is defined on the
-                // enclsoing interval [t-delta1, t+delta2]
+                // enclosing interval [t-delta1, t+delta2]
                 delta1 = delta;
-                for (i = 0;
-                    i < 20 && isNaN(minfunc(t - delta1));
-                    i++, delta1 *= 0.5);
-
+                for (i = 0; i < 20 && isNaN(minfunc(t - delta1)); i++, delta1 *= 0.5);
                 if (isNaN(minfunc(t - delta1))) {
                     delta1 = 0.0;
                 }
                 delta2 = delta;
-                for (i = 0;
-                    i < 20 && isNaN(minfunc(t + delta2));
-                    i++, delta2 *= 0.5);
+                for (i = 0; i < 20 && isNaN(minfunc(t + delta2)); i++, delta2 *= 0.5);
                 if (isNaN(minfunc(t + delta2))) {
                     delta2 = 0.0;
                 }
 
+                // Finally, apply mathemetical optimization in the determined interval
                 t = Numerics.fminbr(minfunc, [
                     Math.max(t - delta1, minX),
                     Math.min(t + delta2, maxX)
@@ -3310,8 +3314,9 @@ JXG.extend(
                 //         t = minX + t - maxX;
                 //     }
                 // } else {
-                t = t < minX ? minX : t;
-                t = t > maxX ? maxX : t;
+
+                t = t < minX_glob ? minX_glob : t;
+                t = t > maxX_glob ? maxX_glob : t;
                 // }
 
                 newCoordsObj = new Coords(

package/src/math/statistics.js

@@ -988,25 +988,29 @@ Mat.Statistics = {
      * @memberof JXG.Math.Statistics
      *
      * @example
-     *  let board = JXG.JSXGraph.initBoard('JXGbox',
-     *       { boundingbox: [-1.7, .5, 30, -.03], axis: true});
-     *
-     *   let runs = [
-     *       [0.5, 20, 'blue'],
-     *       [0.7, 20, 'green'],
-     *       [0.5, 40, 'red'],
-     *   ]
-     *
-     *   let labelY = .4
-     *   runs.forEach((run,i) => {
-     *       board.create('segment',[[7,labelY-(i/50)],[9,labelY-(i/50)]],{strokeColor:run[2]})
-     *       board.create('text',[10,labelY-(i/50),`p=${run[0]}, n=${run[1]}`])
-     *
-     *       let x = Array(50000).fill(0).map(() => JXG.Math.Statistics.randomBinomial(run[1],run[0]))
-     *       let res = JXG.Math.Statistics.histogram(x, { bins: 40, density: true, cumulative: false, range: [0, 40] });
-     *       board.create('curve', [res[1], res[0]], { strokeColor: run[2]});
-     *   })
-     * }
+     * let board = JXG.JSXGraph.initBoard('jxgbox',
+     *     { boundingbox: [-1.7, .5, 30, -.03], axis: true });
+     *
+     * let runs = [
+     *     [0.5, 20, 'blue'],
+     *     [0.7, 20, 'green'],
+     *     [0.5, 40, 'red'],
+     * ];
+     *
+     * let labelY = .4;
+     * runs.forEach((run, i) => {
+     *     board.create('segment', [[7, labelY - (i / 50)], [9, labelY - (i / 50)]], { strokeColor: run[2] });
+     *     board.create('text', [10, labelY - (i / 50), `p=${run[0]}, n=${run[1]}`]);
+     *
+     *     let x = Array(50000).fill(0).map(() => JXG.Math.Statistics.randomBinomial(run[1], run[0]));
+     *     let res = JXG.Math.Statistics.histogram(x, {
+     *         bins: 40,
+     *         density: true,
+     *         cumulative: false,
+     *         range: [0, 40]
+     *     });
+     *     board.create('curve', [res[1], res[0]], { strokeColor: run[2] });
+     * });
      *
      *
      * </pre><div id="JXGda56df4d-a5a5-4c87-9ffc-9bbc1b512302-3" class="jxgbox" style="width: 300px; height: 300px;"></div>
@@ -1342,7 +1346,8 @@ Mat.Statistics = {
             range,
             s,
             counts = [],
-            bins = [];
+            bins = [],
+            no_bin = 0;        // Count of long tail elements not in histogram range
 
         // Evaluate number of bins
         num_bins = opt.bins || 10;
@@ -1377,12 +1382,14 @@ Mat.Statistics = {
             k = Math.floor((x[i] - mi) / delta);
             if (k >= 0 && k < num_bins) {
                 counts[k] += 1;
+            } else {
+                no_bin += 1;
             }
         }
 
         // Normalize if density===true
         if (opt.density) {
-            s = JXG.Math.Statistics.sum(counts);
+            s = JXG.Math.Statistics.sum(counts) + no_bin; // Normalize including long tail
             for (i = 0; i < num_bins; i++) {
                 counts[i] /= (s * delta);
                 // counts[i] /= s;
@@ -1393,7 +1400,7 @@ Mat.Statistics = {
         if (opt.cumulative) {
             if (opt.density) {
                 for (i = 0; i < num_bins; i++) {
-                    counts[i] *= delta;  // normalize
+                    counts[i] *= delta;  // Normalize
                 }
             } for (i = 1; i < num_bins; i++) {
                 counts[i] += counts[i - 1];

package/src/options.js

@@ -1081,8 +1081,8 @@ JXG.Options = {
          * resize calls.
          * <p>
          * <b>Attention:</b> if the JSXGraph container has no CSS property like width or height and max-width or max-height set, but
-         * has a property like boxsizing:box-content, then the interplay between CSS and the resize attribute may result in an
-         * infinite loop with ever increasing JSXgraph container.
+         * has a property like box-sizing:content-box, then the interplay between CSS and the resize attribute may result in an
+         * infinite loop with ever increasing JSXGraph container.
          *
          * @see JXG.Board#startResizeObserver
          * @see JXG.Board#resizeListener
@@ -8609,9 +8609,9 @@ JXG.Options = {
 
         /**
          * If the text content is solely a number and
-         * this attribute is true (default) then the number is formatted
+         * this attribute is true (default) then the number is either formatted
          * according to the number of digits
-         * given by the attribute 'digits' and convert into a fraction if 'toFraction'
+         * given by the attribute 'digits' or converted into a fraction if 'toFraction'
          * is true.
          * <p>
          * Otherwise, display the raw number.
@@ -9334,7 +9334,8 @@ JXG.Options = {
         anchorY: 'middle',
 
         /**
-         * CSS class of the text in non-highlighted view.
+         * Apply CSS classes to the text in non-highlighted view. It is possible to supply one or more
+         * CSS classes separated by blanks.
          *
          * @name cssClass
          * @memberOf Text.prototype
@@ -9344,7 +9345,8 @@ JXG.Options = {
         cssClass: 'JXGtext',
 
         /**
-         * CSS class of the text in highlighted view.
+         * Apply CSS classes to the text in highlighted view. It is possible to supply one or more
+         * CSS classes separated by blanks.
          *
          * @name highlightCssClass
          * @memberOf Text.prototype

package/src/options3d.js

@@ -80,6 +80,7 @@ JXG.extend(Options, {
          */
         xAxisBorder: {
             name: 'x',
+            visible: 'ìnherit',
             withLabel: false,
             label: {
                 position: '50% left',
@@ -89,6 +90,7 @@ JXG.extend(Options, {
             strokeWidth: 1,
             lastArrow: false,
             ticks3d: {
+                visible: 'ìnherit',
                 label: {
                     anchorX: 'middle',
                     anchorY: 'middle'
@@ -123,6 +125,7 @@ JXG.extend(Options, {
          */
         yAxisBorder: {
             name: 'y',
+            visible: 'ìnherit',
             withLabel: false,
             label: {
                 position: '50% right',
@@ -132,6 +135,7 @@ JXG.extend(Options, {
             strokeWidth: 1,
             lastArrow: false,
             ticks3d: {
+                visible: 'ìnherit',
                 label: {
                     anchorX: 'middle'
                 }
@@ -165,6 +169,7 @@ JXG.extend(Options, {
          */
         zAxisBorder: {
             name: 'z',
+            visible: 'ìnherit',
             withLabel: false,
             label: {
                 position: '50% right',
@@ -174,6 +179,7 @@ JXG.extend(Options, {
             strokeWidth: 1,
             lastArrow: false,
             ticks3d: {
+                visible: 'ìnherit',
                 label: {
                     anchorX: 'middle',
                     anchorY: 'middle'
@@ -394,7 +400,7 @@ JXG.extend(Options, {
     axis3d: {
         highlight: false,
         fixed: true,
-        strokecolor: "black",
+        strokeColor: "black",
         strokeWidth: 1,
         tabindex: null,
 
@@ -1018,7 +1024,9 @@ JXG.extend(Options, {
         ],
 
         infobox: {
-            strokeColor: '#888888',
+            // strokeColor: '#888888',
+            strokeColor: '#000000',
+            fontSize: 24,
             useKatex: false,
             useMathjax: false
         },

package/src/{server → unused/server}/JXGServer.py

@@ -6,8 +6,6 @@ import zlib
 import base64
 # CGI variables handling
 import cgi
-#import cgitb
-#cgitb.enable()
 
 import JXG
 import inspect
@@ -17,9 +15,9 @@ import inspect
 from JXGServerModule import JXGServerModule
 
 def print_httpheader():
-    print """\
+    print("""\
 Content-Type: text/plain\n
-"""
+""")
 
 
 def default_action(req, resp):
@@ -27,7 +25,6 @@ def default_action(req, resp):
     resp.error("action \"" + action + "\" is undefined")
     return resp.dump()
     
-
 def import_module(plugin, resp):
     try:
         __import__(plugin, None, None, [''])
@@ -55,7 +52,6 @@ def load_module(req, resp):
         tp.init(resp)
     return resp.dump()
 
-
 def exec_module(req, resp):
     handler = req.getValue('handler', 'none')
     module = req.getValue('module', 'none')
@@ -75,11 +71,10 @@ def exec_module(req, resp):
         else:
             params += (req.getValue(args.args[i]), )
 
-    apply(method, params)
+    method(*params)
 
     return resp.dump()
 
-
 # Get Data from post/get parameters
 form = cgi.FieldStorage();
 
@@ -95,5 +90,5 @@ ret = actions_map.get(action, default_action)(JXG.Request(action, id, data), JXG
 
 print_httpheader()
 
-print base64.b64encode(zlib.compress(ret, 9))
+print(base64.b64encode(zlib.compress(ret, 9)))
 

package/src/{server → unused/server}/JXGServerModule.py

@@ -5,5 +5,5 @@ class JXGServerModule(object):
     def __init__(self):
         self.isJXGServerModule = True
 
-	def init(self, resp):
-		return
+    def init(self, resp):
+        return

package/src/{server → unused/server}/README.md

@@ -1,5 +1,16 @@
 # JSXGraph server scripts
 
+__Update 18.10.2024__
+
+Since v1.10.1 this module is retired !
+
+The server module needs a complete rewrite. The installation is error prone,
+since python 3.13 the module `cgi` is not longer supported.
+A modern implementation would use a different approach with nodejs or
+a comparable system for python.
+
+## Description
+
 JSXGraph is a cross-browser library for interactive geometry, function plotting,
 graphs, and data visualization in a web browser. It is implemented completely in
 JavaScript and uses SVG and VML.
@@ -11,35 +22,35 @@ plot that points in JSXGraph.
 
 Scripts available:
 
--   jxggroebner.py
+- `jxggroebner.py`
 
 ## General configuration
 
-By default server scripts are stored in the server subdirectory of the JavaScript
+By default server scripts are stored in the subdirectory `server` of the JavaScript
 files. If you want the scripts in another place you'll have to adjust
-JXG.serverBase
-either directly in JSX source (loadjsxgraph[InOneFile].js) or by setting it in a
-javascript in your page after loading jsxgraph.
+`JXG.serverBase`
+either directly in JSX source (loadjsxgraph[InOneFile].js) or by setting it with
+javascript in your page after loading JSXGraph.
 
 ## jxggroebner.py
 
--   **Required software**
+- __Required software__
 
-    -   CoCoA (https://cocoa.dima.unige.it/)
-    -   Python (https://python.org/)
-    -   numpy (https://numpy.scipy.org/)
-    -   matplotlib (https://matplotlib.sourceforge.net/)
+    - CoCoA (https://cocoa.dima.unige.it/)
+    - Python (https://python.org/)
+    - numpy (https://numpy.scipy.org/)
+    - matplotlib (https://matplotlib.sourceforge.net/)
 
--   **Setup**
+- __Setup__
 
 Install CoCoA so it can be started by just typing cocoa in a terminal or adjust
-the configuration in jsxgroebner.py. Install all of the python packages.
+the configuration in `jsxgroebner.py`. Install all of the python packages.
 
 Your webserver has to be configured to execute python .py scripts as cgi, e.g.
 for Apache you have to configure
 
-         Options +ExecCGI
-         AddHandler cgi-script .py
+    Options +ExecCGI
+    AddHandler cgi-script .py
 
 for the directory JSXGraph server scripts are in.
 

package/src/{server → unused/server}/RStats.py

@@ -1,7 +1,7 @@
 from JXGServerModule import JXGServerModule
 from rpy import r
 import JXG
-import StringIO, gzip
+import io, gzip
 import datetime, math, random
 
 class RStats(JXGServerModule):

package/src/{server → unused/server}/YahooFinance.py

@@ -1,6 +1,6 @@
 from JXGServerModule import JXGServerModule
 import JXG
-import urllib2, httplib, StringIO, gzip
+import urllib.request, urllib.error, urllib.parse, http.client, io, gzip
 import datetime, math, random
 
 class YahooFinance(JXGServerModule):
@@ -22,14 +22,14 @@ class YahooFinance(JXGServerModule):
     def _getData(self, share):
         #httplib.HTTPConnection.debuglevel = 1
         # todo: adjust the s parameter to input the share given with parameter share
-        request = urllib2.Request('http://finance.yahoo.com/d/quotes.csv?s=' + share.lower() + '&f=sl1d1t1c1ohgv&e=.csv')
+        request = urllib.request.Request('http://finance.yahoo.com/d/quotes.csv?s=' + share.lower() + '&f=sl1d1t1c1ohgv&e=.csv')
         # accept compressed data
         request.add_header('Accept-encoding', 'gzip')
-        opener = urllib2.build_opener()
+        opener = urllib.request.build_opener()
         f = opener.open(request)
 
         compresseddata = f.read()
-        compressedstream = StringIO.StringIO(compresseddata)
+        compressedstream = io.StringIO(compresseddata)
         gzipper = gzip.GzipFile(fileobj=compressedstream)
         try:
             data = gzipper.read()

package/src/{server → unused/server}/fft.py

@@ -3,7 +3,7 @@ import numpy
 import numpy.fft
 import wave, struct, uuid
 import os, subprocess
-import StringIO, gzip, base64
+import io, gzip, base64
 import datetime, math, random
 
 # Should be changed to something more persistent but must be writable by
@@ -31,7 +31,7 @@ class FFT(JXGServerModule):
 
     def fft(self, resp, x):
         y = numpy.fft.rfft(x)
-        y = map(abs, y);
+        y = list(map(abs, y));
         resp.addData('y', y)
         return
 
@@ -40,7 +40,7 @@ class FFT(JXGServerModule):
 
     def ifft(self, resp, x):
         y = numpy.fft.irfft(x)
-        y = map(self._real, y);
+        y = list(map(self._real, y));
         resp.addData('y', y)
         return
 
@@ -54,7 +54,7 @@ class FFT(JXGServerModule):
         w = wave.open(fname, 'r')
         (nchannels, sampwidth, framerate, nframes, comptype, compname) = w.getparams()
         frames = w.readframes(nframes*nchannels)
-        out = map(lambda value: value/8192., struct.unpack_from("%dh" % nframes * nchannels, frames))
+        out = [value/8192. for value in struct.unpack_from("%dh" % nframes * nchannels, frames)]
         w.close()
         # apply fft
         x = numpy.fft.rfft(out)
@@ -66,7 +66,7 @@ class FFT(JXGServerModule):
             x[i] = x[i] * factor
         #ifft
         y = numpy.fft.irfft(x)
-        y = map(self._real, y);
+        y = list(map(self._real, y));
         resp.addData('y', y)
         self.makeAudio(resp, 'ogg', framerate, y)
         return
@@ -95,7 +95,7 @@ class FFT(JXGServerModule):
         w = wave.open(fname, 'r')
         (nchannels, sampwidth, framerate, nframes, comptype, compname) = w.getparams()
         frames = w.readframes(nframes*nchannels)
-        out = map(lambda value: value/8192., struct.unpack_from("%dh" % nframes * nchannels, frames))
+        out = [value/8192. for value in struct.unpack_from("%dh" % nframes * nchannels, frames)]
         w.close()
         step = math.floor(len(out)/7500);
         #resp.addData('audioData',  [out[i] for i in range(len(out)) if i % step == 0]);

package/src/{server → unused/server}/geoloci.py

@@ -21,7 +21,7 @@ import time
 import re
 import zlib
 import base64
-import cStringIO
+import io
 import cgi
 import math
 
@@ -45,7 +45,7 @@ class JXGGeoLociModule(JXGServerModule):
 
         ############################
 
-        self.debugOutput = cStringIO.StringIO()
+        self.debugOutput = io.StringIO()
 
         JXGServerModule.__init__(self)
         return
@@ -96,8 +96,8 @@ class JXGGeoLociModule(JXGServerModule):
         #cinput =  "Ciao;"
 
         if self.debug:
-            print >>self.debugOutput, "Starting CoCoA with input<br />"
-            print >>self.debugOutput, cinput + '<br />'
+            print("Starting CoCoA with input<br />", file=self.debugOutput)
+            print(cinput + '<br />', file=self.debugOutput)
 
         # The suicide pill for the CoCoA process:
         # If not done within the following amount
@@ -109,7 +109,7 @@ class JXGGeoLociModule(JXGServerModule):
 
         def time_limit(seconds):
             def signal_handler(signum, frame):
-                raise TimeoutException, "Timed out!"
+                raise TimeoutException("Timed out!")
             signal.signal(signal.SIGALRM, signal_handler)
             signal.alarm(seconds)
 
@@ -126,7 +126,7 @@ class JXGGeoLociModule(JXGServerModule):
         try:
             time_limit(time_left)
             callCoCoA()
-        except TimeoutException, msg:
+        except TimeoutException as msg:
             # This is only tested with linux/unix
             # and works ONLY if the cocoa script cd-ing
             # to the cocoa dir and starting cocoa executes
@@ -136,7 +136,7 @@ class JXGGeoLociModule(JXGServerModule):
             # sharing tests would be nice).
             self.cocoa_process.kill()
             if self.debug:
-                print >>self.debugOutput, "Timed out!"
+                print("Timed out!", file=self.debugOutput)
             resp.error("Timeout, maybe the system of polynomial is too big or there's an error in it.")
             return
 
@@ -144,8 +144,8 @@ class JXGGeoLociModule(JXGServerModule):
         resp.addData('exectime', calc_time)
 
         if self.debug:
-            print >>self.debugOutput, "Reading and Parsing CoCoA output" + '<br />'
-            print >>self.debugOutput, self.output + '<br />'
+            print("Reading and Parsing CoCoA output" + '<br />', file=self.debugOutput)
+            print(self.output + '<br />', file=self.debugOutput)
 
         # Extract results
         if re.search('resultsbegin', self.output) is None:
@@ -157,9 +157,9 @@ class JXGGeoLociModule(JXGServerModule):
         polynomials = re.split('\n', result)
 
         if self.debug:
-            print >>self.debugOutput, "Found the following polynomials:" + '<br />'
+            print("Found the following polynomials:" + '<br />', file=self.debugOutput)
             for i in range(0,len(polynomials)):
-                print >>self.debugOutput, "Polynomial ", i+1, ": " + polynomials[i] + '<br />'
+                print("Polynomial ", i+1, ": " + polynomials[i] + '<br />', file=self.debugOutput)
 
         datax = []
         datay = []
@@ -198,12 +198,12 @@ class JXGGeoLociModule(JXGServerModule):
         resp.addData('polynomial', polynomialsReturn)
 
         if self.debug:
-            print >>self.debugOutput, ", ".join(map(str, datax)) + '<br />'
-            print >>self.debugOutput, ", ".join(map(str, datay)) + '<br />'
-            print "Content-Type: text/plain\n\n"
-            print
-            print
-            print self.debugOutput.getvalue()
+            print(", ".join(map(str, datax)) + '<br />', file=self.debugOutput)
+            print(", ".join(map(str, datay)) + '<br />', file=self.debugOutput)
+            print("Content-Type: text/plain\n\n")
+            print()
+            print()
+            print(self.debugOutput.getvalue())
 
         self.debugOutput.close()