Mercurial > hg > octave-nkf
annotate scripts/strings/bin2dec.m @ 13164:36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
* base2dec.m, bin2dec.m, hex2dec.m: Allow cellstr inputs.
Amend documentation for new feature and add test for new behavior.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Mon, 19 Sep 2011 17:15:07 -0700 |
| parents | fd0a3ac60b0e |
| children | 72c96de7a403 |
| rev | line source |
|---|---|
| 11523 | 1 ## Copyright (C) 1996-2011 Daniel Calvelo |
| 2325 | 2 ## |
| 2313 | 3 ## This file is part of Octave. |
| 4 ## | |
| 5 ## Octave is free software; you can redistribute it and/or modify it | |
| 6 ## under the terms of the GNU General Public License as published by | |
| 7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
| 8 ## your option) any later version. | |
| 2313 | 9 ## |
| 10 ## Octave is distributed in the hope that it will be useful, but | |
| 11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 ## General Public License for more details. | |
| 14 ## | |
| 15 ## You should have received a copy of the GNU General Public License | |
| 7016 | 16 ## along with Octave; see the file COPYING. If not, see |
| 17 ## <http://www.gnu.org/licenses/>. | |
| 2268 | 18 |
| 3446 | 19 ## -*- texinfo -*- |
| 5666 | 20 ## @deftypefn {Function File} {} bin2dec (@var{s}) |
|
11172
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
21 ## Return the decimal number corresponding to the binary number represented |
|
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
22 ## by the string @var{s}. For example: |
| 2311 | 23 ## |
| 3446 | 24 ## @example |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
25 ## @group |
| 5666 | 26 ## bin2dec ("1110") |
| 3446 | 27 ## @result{} 14 |
|
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
28 ## @end group |
| 3446 | 29 ## @end example |
| 3789 | 30 ## |
|
13164
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
31 ## If @var{s} is a string matrix, return a column vector with one converted |
|
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
32 ## number per row of @var{s}; Invalid rows evaluate to NaN@. |
|
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
33 ## |
|
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
34 ## If @var{s} is a cell array of strings, return a column vector with one |
|
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
35 ## converted number per cell element in @var{s}. |
|
11172
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
36 ## @seealso{dec2bin, base2dec, hex2dec} |
| 3446 | 37 ## @end deftypefn |
| 2311 | 38 |
| 3791 | 39 ## Author: Daniel Calvelo <dcalvelo@yahoo.com> |
| 3789 | 40 ## Adapted-by: Paul Kienzle <pkienzle@kienzle.powernet.co.uk> |
| 2314 | 41 |
|
11172
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
42 function d = bin2dec (s) |
| 2268 | 43 |
|
13164
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
44 if (nargin != 1) |
| 5924 | 45 print_usage (); |
| 2268 | 46 endif |
| 2325 | 47 |
|
13164
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
48 d = base2dec (s, 2); |
|
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
49 |
| 2268 | 50 endfunction |
| 7411 | 51 |
|
13164
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
52 |
|
11172
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
53 %!assert(bin2dec ("0000"), 0); |
|
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
54 %!assert(bin2dec ("1110"), 14); |
|
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
55 %!assert(bin2dec ("11111111111111111111111111111111111111111111111111111"), 2^53-1); |
|
13164
36afcd6fc45f
Allow cellstr inputs to *2dec conversion functions (Bug #34147).
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
56 %!assert(bin2dec ({"1110", "1111"}), [14; 15]); |
| 7411 | 57 |
|
11172
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
58 %%Test input validation |
| 7411 | 59 %!error bin2dec (); |
|
11172
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
60 %!error bin2dec (1); |
|
7e8ce65f73cf
Overhaul functions used to convert between number bases.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
61 %!error bin2dec ("1", 2); |
| 7411 | 62 |