[genius] Wed Mar 12 17:01:07 2014 Jiri (George) Lebl <jirka 5z com>
- From: George Lebl <jirka src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [genius] Wed Mar 12 17:01:07 2014 Jiri (George) Lebl <jirka 5z com>
- Date: Fri, 14 Mar 2014 16:54:25 +0000 (UTC)
commit fe1d2159863cc0187485c04f71b103653b9b76a9
Author: Jiri (George) Lebl <jirka 5z com>
Date: Wed Mar 12 17:06:16 2014 -0500
Wed Mar 12 17:01:07 2014 Jiri (George) Lebl <jirka 5z com>
* src/funclib.c, src/calc.h: Implement NonzeroColumns and
NonzeroElements to return indices of nonzero columns in a matrix
and elements in a vector
* src/matrixw.[ch]: the _vindex function could have returned NULL,
though it didn't seem to cause any crashes
* src/geniustests.txt: test the above
ChangeLog | 11 +++
INSTALL | 250 +++++++++++++++++++++++++++++++++++++++------------
NEWS | 2 +-
help/C/genius.xml | 16 ++++
src/calc.h | 4 +-
src/funclib.c | 95 ++++++++++++++++++-
src/geniustests.txt | 12 +++
src/matrixw.c | 8 +-
src/matrixw.h | 8 +-
9 files changed, 332 insertions(+), 74 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5266a87..22d87a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Mar 12 17:01:07 2014 Jiri (George) Lebl <jirka 5z com>
+
+ * src/funclib.c, src/calc.h: Implement NonzeroColumns and
+ NonzeroElements to return indices of nonzero columns in a matrix
+ and elements in a vector
+
+ * src/matrixw.[ch]: the _vindex function could have returned NULL,
+ though it didn't seem to cause any crashes
+
+ * src/geniustests.txt: test the above
+
Mon Nov 18 17:53:27 2013 Jiri (George) Lebl <jirka 5z com>
* lib/combinatorics/factorial.gel: Fix applying "Triangular" over
diff --git a/INSTALL b/INSTALL
index 23e5f25..007e939 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,25 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+ Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Basic Installation
==================
-These are generic installation instructions.
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package. Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below. The lack of an optional feature in a given package is not
+necessarily a bug. More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +32,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,30 +44,37 @@ some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
-The simplest way to compile this package is:
+ The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
+ documentation. When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+ 6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
@@ -67,45 +83,69 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 7. Often, you can also type `make uninstall' to remove the installed
+ files again. In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+ 8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'. This
+is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -116,16 +156,47 @@ Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them. In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+ The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+ The first method involves providing an override variable for each
+affected directory. For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+ The second method involves providing the `DESTDIR' variable. For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters. On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,14 +208,58 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+ Some packages offer the ability to configure how verbose the
+execution of `make' will be. For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -152,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +286,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +297,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -190,21 +306,30 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation. Until the limitation is lifted, you can use
+this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -231,6 +356,15 @@ configuration-related scripts to be executed by `/bin/bash'.
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-
diff --git a/NEWS b/NEWS
index e16067a..a8027d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
Changes to 1.0.18
* New functions: KroneckerProduct (alias TensorProduct), NewtonsMethod,
- HalleysMethod, LambertW, LambertWm1
+ HalleysMethod, LambertW, LambertWm1, NonzeroColumns, NonzeroElements
* New PlotCanvasFreeze/PlotCanvasThaw functions to improve flicker
if doing animations with genius.
* Allow setting color in LinePlotDrawLine with RGB vector.
diff --git a/help/C/genius.xml b/help/C/genius.xml
index aa1e4f8..eddb0cd 100644
--- a/help/C/genius.xml
+++ b/help/C/genius.xml
@@ -5488,6 +5488,22 @@ functions make this check. Values can be any number including complex numbers.<
</varlistentry>
<varlistentry>
+ <term><anchor id="gel-function-NonzeroColumns"/>NonzeroColumns</term>
+ <listitem>
+ <synopsis>NonzeroColumns (M)</synopsis>
+ <para>Returns a row vector of the indices of nonzero columns in the matrix
<varname>M</varname>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><anchor id="gel-function-NonzeroElements"/>NonzeroElements</term>
+ <listitem>
+ <synopsis>NonzeroElements (v)</synopsis>
+ <para>Returns a row vector of the indices of nonzero elements in the vector
<varname>v</varname>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><anchor id="gel-function-OuterProduct"/>OuterProduct</term>
<listitem>
<synopsis>OuterProduct (u,v)</synopsis>
diff --git a/src/calc.h b/src/calc.h
index 61ba322..1e7f2d6 100644
--- a/src/calc.h
+++ b/src/calc.h
@@ -1,5 +1,5 @@
/* GENIUS Calculator
- * Copyright (C) 1997-2013 Jiri (George) Lebl
+ * Copyright (C) 1997-2014 Jiri (George) Lebl
*
* Author: Jiri (George) Lebl
*
@@ -29,7 +29,7 @@
#include "structs.h"
-#define GENIUS_COPYRIGHT_STRING N_("Copyright (C) 1997-2013 Jiří (George) Lebl")
+#define GENIUS_COPYRIGHT_STRING N_("Copyright (C) 1997-2014 Jiří (George) Lebl")
typedef enum {
GEL_NO_ERROR = 0,
diff --git a/src/funclib.c b/src/funclib.c
index e56a48e..7232abe 100644
--- a/src/funclib.c
+++ b/src/funclib.c
@@ -1,5 +1,5 @@
/* GENIUS Calculator
- * Copyright (C) 1997-2013 Jiri (George) Lebl
+ * Copyright (C) 1997-2014 Jiri (George) Lebl
*
* Author: Jiri (George) Lebl
*
@@ -5433,12 +5433,12 @@ etree_out_of_int_vector (int *vec, int len)
return n;
}
-#if 0
+/* eats the glist and frees it */
static GelETree *
-etree_out_of_etree_list (GList *list, int len)
+etree_out_of_etree_list (GSList *list, int len)
{
GelMatrix *mm;
- GList *li;
+ GSList *li;
int i;
GelETree *n;
@@ -5450,6 +5450,7 @@ etree_out_of_etree_list (GList *list, int len)
gel_matrix_index (mm, i, 0) = li->data;
li = li->next;
}
+ g_slist_free (list);
GEL_GET_NEW_NODE (n);
n->type = GEL_MATRIX_NODE;
@@ -5458,7 +5459,6 @@ etree_out_of_etree_list (GList *list, int len)
return n;
}
-#endif
static gboolean
comb_get_next_combination (int *vec, int len, int n)
@@ -5773,6 +5773,7 @@ NextCombination_op (GelCtx *ctx, GelETree * * a, gboolean *exception)
return r;
}
+
static GelETree *
nCr_op (GelCtx *ctx, GelETree * * a, gboolean *exception)
{
@@ -5819,6 +5820,88 @@ nCr_op (GelCtx *ctx, GelETree * * a, gboolean *exception)
}
static GelETree *
+NonzeroColumns_op (GelCtx *ctx, GelETree * * a, gboolean *exception)
+{
+ GelMatrixW *m;
+ int i, j, w, h;
+ int cnt;
+ GSList *cols;
+
+ if G_UNLIKELY ( ! check_argument_matrix_or_null (a, 0, "NonzeroColumns"))
+ return NULL;
+
+ if (a[0]->type == GEL_NULL_NODE)
+ return gel_makenum_null ();
+
+ m = a[0]->mat.matrix;
+ w = gel_matrixw_width (m);
+ h = gel_matrixw_height (m);
+ cnt = 0;
+ cols = NULL;
+ /* Must be done in this order and not rowise as is usual for genius! */
+ for (i = 0; i < w; i++) {
+ for (j = 0; j < h; j++) {
+ GelETree *t = gel_matrixw_get_index (m, i, j);
+ if ( ! ( t == NULL ||
+ t->type == GEL_NULL_NODE ||
+ (t->type == GEL_VALUE_NODE &&
+ mpw_zero_p (t->val.value)))) {
+ cols = g_slist_prepend (cols,
+ gel_makenum_ui(i+1));
+ cnt++;
+ break;
+ }
+ }
+ }
+
+ if (cnt == 0) {
+ return gel_makenum_null ();
+ } else {
+ cols = g_slist_reverse (cols);
+ return etree_out_of_etree_list (cols, cnt);
+ }
+}
+
+static GelETree *
+NonzeroElements_op (GelCtx *ctx, GelETree * * a, gboolean *exception)
+{
+ GelMatrixW *m;
+ int i, e;
+ int cnt;
+ GSList *elts;
+
+ if G_UNLIKELY ( ! check_argument_matrix_or_null (a, 0, "NonzeroElements"))
+ return NULL;
+
+ if (a[0]->type == GEL_NULL_NODE)
+ return gel_makenum_null ();
+
+ m = a[0]->mat.matrix;
+ e = gel_matrixw_elements (m);
+ cnt = 0;
+ elts = NULL;
+ /* Must be done in this order and not rowise as is usual for genius! */
+ for (i = 0; i < e; i++) {
+ GelETree *t = gel_matrixw_get_vindex (m, i);
+ if ( ! (t == NULL ||
+ t->type == GEL_NULL_NODE ||
+ (t->type == GEL_VALUE_NODE &&
+ mpw_zero_p (t->val.value)))) {
+ elts = g_slist_prepend (elts,
+ gel_makenum_ui(i+1));
+ cnt++;
+ }
+ }
+
+ if (cnt == 0) {
+ return gel_makenum_null ();
+ } else {
+ elts = g_slist_reverse (elts);
+ return etree_out_of_etree_list (elts, cnt);
+ }
+}
+
+static GelETree *
protect_op(GelCtx *ctx, GelETree * * a, gboolean *exception)
{
GelToken *tok;
@@ -6654,6 +6737,8 @@ gel_funclib_addall(void)
FUNC (DiagonalOf, 1, "M", "matrix", N_("Gets the diagonal entries of a matrix as a column vector"));
FUNC (CountZeroColumns, 1, "M", "matrix", N_("Count the number of zero columns in a matrix"));
FUNC (StripZeroColumns, 1, "M", "matrix", N_("Removes any all-zero columns of M"));
+ FUNC (NonzeroColumns, 1, "M", "matrix", N_("Return a vector with the indices of the nonzero columns
in a matrix"));
+ FUNC (NonzeroElements, 1, "v", "matrix", N_("Return a vector with the indices of the nonzero elements
in a vector"));
FUNC (ComplexConjugate, 1, "M", "numeric", N_("Calculates the conjugate"));
conj_function = f;
diff --git a/src/geniustests.txt b/src/geniustests.txt
index 863536a..63beece 100644
--- a/src/geniustests.txt
+++ b/src/geniustests.txt
@@ -1143,6 +1143,18 @@ KroneckerProduct([0],null)+0 ((null)+0)
|NewtonsMethod (`(x)=x*e^x-10,`(x)=x*e^x+e^x,1.0,0.0001,100) - LambertW(10)|<0.0001 true
|NewtonsMethod (`(x)=x*e^x+0.1,`(x)=x*e^x+e^x,-2.0,0.0001,100) - LambertWm1(-0.1)|<0.0001 true
|HalleysMethod (`(x)=x*e^x-0.5,`(x)=x*e^x+e^x,`(x)=x*e^x+2*e^x,1.0,0.0001,100) - LambertW(0.5)|<0.0001 true
+NonzeroColumns([1,2;3,4]) [1,2]
+NonzeroColumns([I(4),zeros(4,4)]) [1,2,3,4]
+NonzeroColumns([zeros(4,4),I(4)]) [5,6,7,8]
+NonzeroColumns([1,0,2;0,0,4]) [1,3]
+NonzeroColumns(zeros(4,4))+0 ((null)+0)
+NonzeroElements(zeros(4,4))+0 ((null)+0)
+NonzeroElements([1,0,2;0,0,4]) [1,3,6]
+NonzeroElements([1,0,2,0,0,4]) [1,3,6]
+NonzeroElements([1,0,2,0,0,4]') [1,3,6]
+NonzeroElements([1,0,2,0,0]) [1,3]
+NonzeroElements(["fpp",0,"foo",0,0]) [1,3]
+m=randint(2,5,5);NonzeroColumns(MakeVector(m.').')==NonzeroElements(m) true
load "nullspacetest.gel" true
load "longtest.gel" true
load "testprec.gel" true
diff --git a/src/matrixw.c b/src/matrixw.c
index 2a7d831..e0a85ec 100644
--- a/src/matrixw.c
+++ b/src/matrixw.c
@@ -1,5 +1,5 @@
/* GENIUS Calculator
- * Copyright (C) 1997-2011 Jiri (George) Lebl
+ * Copyright (C) 1997-2014 Jiri (George) Lebl
*
* Author: Jiri (George) Lebl
*
@@ -1367,11 +1367,11 @@ gel_matrixw_vindex(GelMatrixW *m, int i) {
int w = gel_matrixw_width(m);
/* Avoid dividing things */
if (w == 1)
- t = gel_matrixw_get_index (m, 0, i);
+ t = gel_matrixw_index (m, 0, i);
else if (gel_matrixw_height(m) == 1)
- t = gel_matrixw_get_index (m, i, 0);
+ t = gel_matrixw_index (m, i, 0);
else
- t = gel_matrixw_get_index (m, i % w, i / w);
+ t = gel_matrixw_index (m, i % w, i / w);
return t ? t : the_zero;
}
#endif
diff --git a/src/matrixw.h b/src/matrixw.h
index 8dabfff..7b0333a 100644
--- a/src/matrixw.h
+++ b/src/matrixw.h
@@ -1,5 +1,5 @@
/* GENIUS Calculator
- * Copyright (C) 1997-2011 Jiri (George) Lebl
+ * Copyright (C) 1997-2014 Jiri (George) Lebl
*
* Author: Jiri (George) Lebl
*
@@ -154,11 +154,11 @@ gel_matrixw_vindex(GelMatrixW *m, int i) {
int w = gel_matrixw_width(m);
/* Avoid dividing things */
if (w == 1)
- t = gel_matrixw_get_index (m, 0, i);
+ t = gel_matrixw_index (m, 0, i);
else if (gel_matrixw_height(m) == 1)
- t = gel_matrixw_get_index (m, i, 0);
+ t = gel_matrixw_index (m, i, 0);
else
- t = gel_matrixw_get_index (m, i % w, i / w);
+ t = gel_matrixw_index (m, i % w, i / w);
return t ? t : the_zero;
}
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
