summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanojgudi2013-07-23 07:54:12 +0530
committermanojgudi2013-07-23 07:54:12 +0530
commit43114165fb5e59c4267991f4922970c897fe2d88 (patch)
treec4cd97ed682dd75c0efa8991243b04b13633e270
downloadsciscipy-1.0.0-43114165fb5e59c4267991f4922970c897fe2d88.tar.gz
sciscipy-1.0.0-43114165fb5e59c4267991f4922970c897fe2d88.tar.bz2
sciscipy-1.0.0-43114165fb5e59c4267991f4922970c897fe2d88.zip
initial commit
-rw-r--r--CHANGELOG23
-rw-r--r--COPYING676
-rw-r--r--MANIFEST.in7
-rw-r--r--PKG-INFO10
-rw-r--r--README107
-rw-r--r--callpython/callpython.c39
-rw-r--r--callpython/callpython.sci59
-rw-r--r--deallocator.c57
-rw-r--r--deallocator.h24
-rw-r--r--doc/tutorial/fig/plot2d_screenshot.jpgbin0 -> 146877 bytes
-rwxr-xr-xsciconv_read.c499
-rwxr-xr-xsciconv_read.h47
-rwxr-xr-xsciconv_write.c604
-rwxr-xr-xsciconv_write.h53
-rw-r--r--scilab.cfg15
-rw-r--r--scilab.py262
-rwxr-xr-xsciscipy.c208
-rwxr-xr-xsetup.py123
-rw-r--r--tests/__init__.py0
-rw-r--r--tests/test_call.py53
-rw-r--r--tests/test_matrix.py71
-rw-r--r--tests/test_read.py23
-rw-r--r--util.c148
-rw-r--r--util.h32
24 files changed, 3140 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..5e778a5
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,23 @@
+sciscipy (1.0.0)
+
+ * Update of the documentation
+ * Clean up of the Python code (pylint rocks)
+ * Update the search of scilab.cfg:
+ - current directory
+ - ../../../share/sciscipy/scilab.cfg
+ - /usr/share/sciscipy/scilab.cfg (like before)
+ * Fix some C warnings
+
+ -- Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com> Wed, 16 Jan 2013 12:16:58 +0100
+
+sciscipy (0.4.0)
+
+ * Update of the documentation
+ * Use call_scilab.h include instead of extern
+ * Match the declaration from Scilab 5.3.3 and upper
+ * Remove some dead code
+ * Add the --no-as-needed option to the linker
+ * Thanks to Luca DALL'OLIO for the various comments
+
+ -- Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com> Sun, 30 Sep 2012 13:46:46 +0200
+
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..4432540
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,676 @@
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program 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.
+
+ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..d9ec3ab
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,7 @@
+include *.c
+include *.h
+recursive-include tests *.py
+include MANIFEST.in
+include COPYING
+include scilab.cfg
+
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..12af481
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: sciscipy
+Version: 1.0.0
+Summary: Scilab binding
+Home-page: http://forge.scilab.org/index.php/p/sciscipy/
+Author: Sylvestre Ledru
+Author-email: sylvestre.ledru@scilab-enterprises.com
+License: GPL
+Description: UNKNOWN
+Platform: UNKNOWN
diff --git a/README b/README
new file mode 100644
index 0000000..19800d3
--- /dev/null
+++ b/README
@@ -0,0 +1,107 @@
+This package creates a python module called sciscipy.
+
+It provides a link between python and Scilab by defining 3 functions:
+
+- sciscipy.eval(sci_cmd)
+- sciscipy.read(sci_var_name)
+- sciscipy.write(sci_var_name, py_var_name)
+
+To increase the level of enjoyment, a python module
+called scilab is also provided. This package contains a
+class 'Scilab' that can be used to issue any valid Scilab
+command. Use it as follows:
+
+>>> from scilab import Scilab
+>>> sci = Scilab()
+>>> (any_output, ...) = sci.any_func(param1, ...)
+
+INSTALL
+========
+
+LINUX
+
+$ ./setup.py build
+$ sudo ./setup.py install
+
+Debian/Ubuntu
+
+$ ./setup.py build
+$ sudo ./setup.py install --install-layout=deb
+
+$ ./setup
+
+WINDOWS
+
+c:\Python26\python.exe setup.py build --compiler=mingw32
+c:\Python26\python.exe setup.py build install
+
+
+To build with an other compiler (ex: clang)
+$ CC=clang python setup.py build
+
+
+To clean the build:
+
+setup.py clean --all
+
+
+RUN
+===
+
+LINUX
+-----
+
+the LD_LIBRARY_PATH environment variable must be set, for instance to
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/jvm/default-java/jre/lib/amd64/:/usr/lib/jvm/default-java//jre/lib/amd64/server/
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/jvm/default-java/jre/lib/amd64/native_threads/
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/scilab
+export SCI=/usr/share/scilab
+
+See http://help.scilab.org/docs/current/en_US/compile_and_run_call_scilab.html
+
+
+Ubuntu
+------
+
+It is not possible to set LD_LIBRARY_PATH
+globally so you have to create a file sciscipy.conf in
+/etc/ld.so.conf.d:
+
+$ cat /etc/ld.so.conf.d/sciscipy.conf
+/usr/lib/scilab
+/usr/lib/jvm/default-java/jre/lib/i386/native_threads/
+/usr/lib/jvm/default-java/jre/lib/i386/
+/usr/lib/jvm/default-java/jre/lib/i386/server/
+
+You also have to define the SCI environment variable in
+/etc/environment :
+
+$ cat /etc/environment
+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/b
+in:/usr/games"
+SCI="/usr/share/scilab"
+
+
+WINDOWS
+-------
+
+must include C:\Program Files (x86)\scilab-5.2.1\bin in the path
+
+and set the SCI enironment variable to C:\Program Files (x86)\scilab-5.2.1\
+
+
+TESTS
+=====
+
+To run the tests, the command:
+PYTHONPATH=build/lib.linux-x86_64-2.7/ python setup.py test
+should be launched.
+PYTHONPATH should be set if sciscipy is not installed in a system path.
+
+
+Coding style
+============
+
+The coding style is done through the command:
+astyle --pad-header --suffix=none --pad-oper --indent-col1-comments --indent-switches --indent=spaces=4 --add-brackets --formatted --style=bsd *.c
diff --git a/callpython/callpython.c b/callpython/callpython.c
new file mode 100644
index 0000000..5b1c101
--- /dev/null
+++ b/callpython/callpython.c
@@ -0,0 +1,39 @@
+#include <Python.h>
+
+void py_initialize_c()
+{
+ Py_Initialize() ;
+}
+
+void py_finalize_c()
+{
+ Py_Finalize() ;
+}
+
+void py_eval_c(char * exec_str)
+{
+ PyRun_SimpleString(exec_str) ;
+}
+
+// Read an integer value
+// @in py_var: the name of the python var to read
+// @out sci_var: the return variable
+void py_read_int_c(char * py_var, int * sci_var)
+{
+ PyObject* main_module = PyImport_AddModule("__main__") ;
+ PyObject* main_dict = PyModule_GetDict(main_module) ;
+
+ if (PyDict_Contains(main_dict, PyString_FromString(py_var)))
+ {
+ PyObject * py_int = PyDict_GetItem(main_dict, PyString_FromString(py_var)) ;
+ if (PyInt_Check(py_int)){
+
+ *sci_var = PyInt_AS_LONG(py_int) ;
+ return ;
+ }
+ // Handle not an int error
+ return ;
+ }
+ // Handle var not found error
+ *sci_var = 0 ;
+} \ No newline at end of file
diff --git a/callpython/callpython.sci b/callpython/callpython.sci
new file mode 100644
index 0000000..cc0b5e4
--- /dev/null
+++ b/callpython/callpython.sci
@@ -0,0 +1,59 @@
+// This modue provide three function to interact with a python interpretor:
+//
+// - py_write : write a scilab variable in python
+// - py_read : read a python variable in scilab
+// - py_eval : evaluate a python string
+//
+// A convenience function to call into python is also provided
+
+global GLOB_PY_INIT ;
+GLOB_PY_INIT = %F ;
+
+function py_write(pyname, scivar)
+// TODO
+endfunction
+
+function sci_var = py_read(py_name)
+ var_type = py_type(py_name)
+ // Call the right function accoring to var_type
+ sci_var = call('py_read_int_c', py_name, 1, 'c','out', [1,1], 2, 'i')
+endfunction
+
+function ptype = py_type(py_name)
+// @param py_name: the name of a python variable
+// @return: an integer,
+ ptype = 1
+endfunction
+
+function py_eval(eval_str)
+ call('py_eval_c',eval_str, 1, 'c','out')
+endfunction
+
+function py_initialize()
+ global GLOB_PY_INIT
+ if GLOB_PY_INIT == %F
+ call('py_initialize_c', 'out')
+ GLOB_PY_INIT = %T ;
+ end
+endfunction
+
+function py_finalize()
+ call('py_finalize_c', 'out')
+endfunction
+
+function call_python(funcname, varargin)
+ for i=1:length(varargin)
+ arg = varargin(i)
+ pywrite(printf("_tmp%i_", arg))
+ end
+endfunction
+
+intf = [ 'py_initialize_c', 'py_finalize_c','py_eval_c', 'py_read_int_c'] ;
+
+libn = ilib_for_link(intf, 'callpython.c','', 'c' ,'make' , ...
+ 'loader.sce' ,'callpython.lib','-LIBPATH:C:\Python26\libs', ...
+ '-IC:\Python26\include') ;
+
+exec('loader.sce') ;
+py_initialize()
+
diff --git a/deallocator.c b/deallocator.c
new file mode 100644
index 0000000..5691777
--- /dev/null
+++ b/deallocator.c
@@ -0,0 +1,57 @@
+/** deallocator.c
+*
+* Pattern described in http://blog.enthought.com/?p=62
+*
+*/
+
+#include "deallocator.h"
+
+void attach_deallocator(PyObject *array, void * mem)
+{
+ PyObject *newobj ;
+
+ newobj = _PyObject_New(&_MyDeallocType) ;
+ ((struct _MyDeallocStruct *)newobj)->memory = mem ;
+ PyArray_BASE(array) = newobj ;
+ if (DEBUG_MEM_ALLOC == 1)
+ {
+ printf("ALLOCATED %p\n", mem) ;
+ }
+} ;
+
+static void _mydealloc_dealloc(PyObject *self)
+{
+ if (DEBUG_MEM_ALLOC == 1)
+ {
+ printf("FREEING %p\n", ((struct _MyDeallocStruct*) self)->memory) ;
+ }
+ free(((struct _MyDeallocStruct*) self)->memory);
+ self->ob_type->tp_free((PyObject *) self);
+} ;
+
+PyTypeObject _MyDeallocType =
+{
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+ "mydeallocator", /*tp_name*/
+ sizeof(_MyDeallocObject), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ _mydealloc_dealloc, /*tp_dealloc*/
+ 0, /*tp_print*/
+ 0, /*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ 0, /*tp_repr*/
+ 0, /*tp_as_number*/
+ 0, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash */
+ 0, /*tp_call*/
+ 0, /*tp_str*/
+ 0, /*tp_getattro*/
+ 0, /*tp_setattro*/
+ 0, /*tp_as_buffer*/
+ Py_TPFLAGS_DEFAULT, /*tp_flags*/
+ "Internal deallocator object", /* tp_doc */
+} ;
+
diff --git a/deallocator.h b/deallocator.h
new file mode 100644
index 0000000..06d5c0b
--- /dev/null
+++ b/deallocator.h
@@ -0,0 +1,24 @@
+#ifndef _DEALLOCATOR_H
+#define _DEALLOCATOR_H
+
+#include <Python.h>
+
+#if NUMPY == 1
+#include <numpy/arrayobject.h>
+
+
+#define DEBUG_MEM_ALLOC 0
+
+struct _MyDeallocStruct
+{
+ PyObject_HEAD
+ void *memory ;
+} ;
+
+
+extern struct _MyDeallocStruct _MyDeallocObject ;
+extern PyTypeObject _MyDeallocType ;
+extern void attach_deallocator(PyObject *, void *) ;
+
+#endif
+#endif \ No newline at end of file
diff --git a/doc/tutorial/fig/plot2d_screenshot.jpg b/doc/tutorial/fig/plot2d_screenshot.jpg
new file mode 100644
index 0000000..14092f2
--- /dev/null
+++ b/doc/tutorial/fig/plot2d_screenshot.jpg
Binary files differ
diff --git a/sciconv_read.c b/sciconv_read.c
new file mode 100755
index 0000000..bced729
--- /dev/null
+++ b/sciconv_read.c
@@ -0,0 +1,499 @@
+/*
+ This file is part of Sciscipy.
+
+ Sciscipy 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.
+
+ Sciscipy 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2009, Vincent Guffens.
+*/
+
+/*
+ Types defined in scilab:
+
+ 1 : real or complex constant matrix.
+ 2 : polynomial matrix.
+ 4 : boolean matrix.
+ 5 : sparse matrix.
+ 6 : sparse boolean matrix.
+ 8 : matrix of integers stored on 1 2 or 4 bytes
+ 9 : matrix of graphic handles
+ 10 : matrix of character strings.
+ 11 : un-compiled function.
+ 13 : compiled function.
+ 14 : function library.
+ 15 : list.
+ 16 : typed list (tlist)
+ 17 : mlist
+ 128 : pointer
+
+
+ NOTE: the way numpy vectors and matrices are created leads
+ to a memory leak.
+*/
+
+#include "sciconv_read.h"
+#include "deallocator.h"
+#include "util.h"
+
+struct sciconv_read_struct *sciconv_read_list = NULL ;
+
+PyObject *
+sciconv_read (int *addr, int var_type)
+{
+ char er_msg[BUFSIZE] ;
+
+ struct sciconv_read_struct *conv = sciconv_read_list ;
+
+ while (conv)
+ {
+ if (conv->scitype == var_type)
+ {
+ return conv->conv_func(addr) ;
+ }
+ conv = conv->next ;
+ }
+
+ snprintf(er_msg, BUFSIZE, "Type %i not supported", var_type) ;
+ PyErr_SetString(PyExc_TypeError, er_msg) ;
+ return NULL ;
+
+
+} ;
+
+
+#if NUMPY == 1
+static PyObject * create_numpyarray(double *cxtmp, int m, int n)
+{
+ PyObject *array ;
+ npy_intp dim[2], mn ;
+
+ if (m == 1 || n == 1)
+ {
+ mn = m * n ;
+
+ array = PyArray_NewFromDescr(&PyArray_Type, \
+ PyArray_DescrFromType(PyArray_DOUBLE), \
+ 1, \
+ &mn, \
+ NULL, \
+ (void *) cxtmp, \
+ NPY_OWNDATA | NPY_FARRAY, \
+ NULL
+ ) ;
+
+ attach_deallocator(array, cxtmp) ;
+
+ return array ;
+ }
+
+ dim[0] = m ;
+ dim[1] = n ;
+
+ array = PyArray_NewFromDescr(&PyArray_Type, \
+ PyArray_DescrFromType(PyArray_DOUBLE), \
+ 2, \
+ dim, \
+ NULL, \
+ (void *) cxtmp, \
+ NPY_OWNDATA | NPY_FARRAY, \
+ NULL
+ ) ;
+
+ attach_deallocator(array, cxtmp) ;
+
+ return array ;
+
+}
+
+static PyObject * create_cnumpyarray(double *cxtmp, double *cxtmp_img, int m, int n)
+{
+ PyObject * array ;
+ int i, j ;
+ npy_intp dim[2], mn ;
+ complex * cxtmp_transpose ;
+
+ cxtmp_transpose = (complex*) malloc(2 * m * n * sizeof(complex));
+
+ dim[0] = m ;
+ dim[1] = n ;
+
+ if (!cxtmp_transpose)
+ {
+ PyErr_SetString(PyExc_MemoryError, "out of memory") ;
+ return NULL ;
+ }
+
+ for (i = 0; i < m; ++i)
+ for (j = 0; j < n; ++j)
+ {
+ cxtmp_transpose[i * n + j][0] = cxtmp[j * m + i] ;
+ cxtmp_transpose[i * n + j][1] = cxtmp_img[j * m + i] ;
+
+ }
+
+ if (m == 1 || n == 1)
+ {
+ mn = m * n ;
+
+
+ array = PyArray_NewFromDescr(&PyArray_Type, \
+ PyArray_DescrFromType(PyArray_CDOUBLE), \
+ 1, \
+ &mn, \
+ NULL, \
+ (void *) cxtmp_transpose, \
+ NPY_OWNDATA | NPY_CARRAY, \
+ NULL
+ ) ;
+ }
+ else
+
+ array = PyArray_NewFromDescr(&PyArray_Type, \
+ PyArray_DescrFromType(PyArray_CDOUBLE), \
+ 2, \
+ dim, \
+ NULL, \
+ (void *) cxtmp_transpose, \
+ NPY_OWNDATA | NPY_CARRAY, \
+ NULL
+ ) ;
+
+ free(cxtmp) ;
+ attach_deallocator(array, cxtmp_transpose) ;
+ return array ;
+
+}
+#else
+
+static PyObject * create_listmatrix(double *cxtmp, double *cxtmp_img, int m, int n, int is_complex)
+{
+ int i, j ;
+ PyObject *new_list, *new_line ;
+ Py_complex new_complex ;
+
+
+ if (m == 1 || n == 1)
+ {
+ new_list = PyList_New(m * n) ;
+
+ for (i = 0 ; i < m * n ; i++)
+ {
+ if (cxtmp_img != NULL)
+ {
+ new_complex.real = cxtmp[i] ;
+ new_complex.imag = cxtmp_img[i] ;
+ PyList_SET_ITEM(new_list, i, Py_BuildValue("D", &new_complex)) ;
+ }
+ else
+ {
+ PyList_SET_ITEM(new_list, i, Py_BuildValue("d", cxtmp[i])) ;
+ }
+ }
+ }
+ else
+ {
+ new_list = PyList_New(m) ;
+ for (i = 0 ; i < m ; i++)
+ {
+ new_line = PyList_New(n) ;
+ for (j = 0 ; j < n ; j++)
+ if (cxtmp_img != NULL)
+ {
+ new_complex.real = cxtmp[j * m + i] ;
+ new_complex.imag = cxtmp_img[j * m + i] ;
+ PyList_SET_ITEM(new_line, j, Py_BuildValue("D", &new_complex)) ;
+ }
+ else
+ {
+ PyList_SET_ITEM(new_line, j, Py_BuildValue("d", cxtmp[j * m + i])) ;
+ }
+
+ PyList_SET_ITEM(new_list, i, new_line) ;
+ }
+ }
+
+ free(cxtmp) ;
+
+ return new_list ;
+};
+
+#endif
+
+/**
+ * Type 1 : real or complex constant matrix.
+ * @param name: the name of the scilab variable we want to read
+ * @return: A list of list
+*/
+static PyObject * read_matrix(int *addr)
+{
+
+ int m, n ;
+ SciErr sciErr ;
+ double *cxtmp = NULL ;
+ double *cx = NULL, *cx_img = NULL;
+ double *cxtmp_img = NULL ;
+ PyObject * matrix ;
+
+ if (!isVarComplex(pvApiCtx, addr))
+ {
+ sciErr = getMatrixOfDouble(pvApiCtx, addr, &m, &n, NULL) ;
+ }
+ else
+ {
+ sciErr = getComplexMatrixOfDouble(pvApiCtx, addr, &m, &n, NULL, NULL) ;
+ }
+
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, getErrorMessage(sciErr)) ;
+ return 0;
+ }
+
+
+ cx = (double*)malloc((m * n) * sizeof(double));
+
+ if (!cx)
+ {
+ PyErr_SetString(PyExc_MemoryError, "out of memory") ;
+ return NULL ;
+ }
+
+ if (!isVarComplex(pvApiCtx, addr))
+ {
+ sciErr = getMatrixOfDouble(pvApiCtx, addr, &m, &n, &cxtmp) ;
+ if (sciErr.iErr)
+ {
+ free(cx);
+ PyErr_SetString(PyExc_TypeError, "Error in readmatrix") ;
+ return 0;
+ }
+
+ memcpy(cx, cxtmp, sizeof(double) * n * m) ;
+#if NUMPY == 1
+ matrix = create_numpyarray(cx, m, n) ;
+#else
+ matrix = create_listmatrix(cx, NULL, m, n) ;
+#endif
+
+ }
+ else
+ {
+ cx_img = (double*)malloc((m * n) * sizeof(double));
+
+ if (!cx_img)
+ {
+ free(cx) ;
+ free(cxtmp) ;
+ PyErr_SetString(PyExc_MemoryError, "out of memory") ;
+ return NULL ;
+ }
+ sciErr = getComplexMatrixOfDouble(pvApiCtx, addr, &m, &n, &cxtmp, &cxtmp_img) ;
+ if (sciErr.iErr)
+ {
+ free(cx) ;
+ free(cx_img);
+ PyErr_SetString(PyExc_TypeError, "Error in readmatrix") ;
+ return 0;
+ }
+
+ memcpy(cx, cxtmp, sizeof(double) * n * m) ;
+ memcpy(cx_img, cxtmp_img, sizeof(double) * n * m) ;
+
+#if NUMPY == 1
+ matrix = create_cnumpyarray(cx, cx_img, m, n) ;
+#else
+ matrix = create_listmatrix(cx, cx_img, m, n) ;
+#endif
+ free(cx_img);
+ }
+
+ return matrix ;
+}
+
+
+/**
+ * Type 10 : Matrix of string.
+ * @param name: the name of the scilab variable we want to read
+ * @return: A list of string
+*/
+static PyObject * read_string(int *addr)
+{
+
+ int m = 0, n = 0 ;
+ int i = 0 ;
+ int x = 0, y = 0 ;
+
+ char ** variable_from_scilab = NULL ;
+ SciErr sciErr;
+
+ sciErr = getMatrixOfString(pvApiCtx, addr, &m, &n, NULL, NULL) ;
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, getErrorMessage(sciErr)) ;
+ return 0;
+ }
+
+ int *piLen = (int*)malloc(sizeof(int) * m * n);
+
+ PyObject *new_list ;
+ sciErr = getMatrixOfString(pvApiCtx, addr, &m, &n, piLen, NULL) ;
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, getErrorMessage(sciErr)) ;
+ return 0;
+ }
+
+ variable_from_scilab = (char **) malloc(sizeof(char*) * (m * n)) ;
+
+ for (i = 0; i < m * n; i++)
+ {
+ variable_from_scilab[i] = (char*) malloc(sizeof(char) * (piLen[i])) ;
+ }
+
+ i = 0;
+ new_list = PyList_New(m * n) ;
+ sciErr = getMatrixOfString(pvApiCtx, addr, &m, &n, piLen, variable_from_scilab) ;
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, getErrorMessage(sciErr)) ;
+ return 0;
+ }
+
+ for (x = 0; x < m; x++)
+ {
+ for (y = 0; y < n; y++)
+ {
+ char *tmpStr = variable_from_scilab[x * m + y] ;
+ PyList_SET_ITEM(new_list, i, Py_BuildValue("s", tmpStr)) ;
+ free(tmpStr) ;
+ i++;
+ }
+ }
+
+ return new_list ;
+}
+
+/**
+ * Type 16 : tlist (typed list).
+ *
+ * A tlist x = tlist(['test','a','b'],12,'item')
+ * is transformed in python in
+ * x = { "__tlist_name" : "test",
+ * "a" : 12,
+ * "b" : "item",
+ * }
+ *
+ * @param tlist_address: the address of the scilab variable we want to read
+ * @return: A dictionary
+*/
+static PyObject * read_tlist(int *tlist_address)
+{
+ SciErr sciErr ;
+ PyObject *new_dict = NULL ;
+ PyObject *key_list = NULL ;
+ int nb_item = 0, i;
+
+ sciErr = getListItemNumber(pvApiCtx, tlist_address, &nb_item) ;
+ if (sciErr.iErr)
+ {
+ goto handle_error ;
+ }
+
+ new_dict = PyDict_New() ;
+ for (i = 1 ; i <= nb_item; ++i)
+ {
+ PyObject *py_item ;
+ int *item_address = NULL ;
+ int sci_type = 0 ;
+
+ sciErr = getListItemAddress(pvApiCtx, tlist_address, i, &item_address) ;
+ if (sciErr.iErr)
+ {
+ goto handle_error ;
+ }
+ sciErr = getVarType(pvApiCtx, item_address, &sci_type) ;
+ if (sciErr.iErr)
+ {
+ goto handle_error ;
+ }
+ py_item = sciconv_read (item_address, sci_type) ;
+ if (i == 1)
+ {
+ if (sci_type != 10)
+ {
+ PyErr_SetString(PyExc_TypeError, "First tlist item must be string") ;
+ return 0 ;
+ }
+
+ key_list = py_item ;
+ PyDict_SetItem(new_dict, Py_BuildValue("s", TLIST_NAME), \
+ PyList_GetItem(key_list, i - 1)) ;
+
+ }
+ else
+ {
+ PyObject *next_item = NULL ;
+ next_item = PyList_GetItem(key_list, i - 1) ;
+ if (next_item == NULL)
+ {
+ PyErr_SetString(PyExc_TypeError, "Cannot read tlist (wrong number of key)") ;
+ return 0 ;
+ }
+ PyDict_SetItem(new_dict, PyList_GetItem(key_list, i - 1), py_item) ;
+ }
+ }
+
+
+ return new_dict;
+
+handle_error:
+ PyErr_SetString(PyExc_TypeError, getErrorMessage(sciErr)) ;
+ return 0;
+}
+
+/**
+ * Add a new converter to the list
+ * @param new_type: A scilab type number
+ * @param func: The converter function
+*/
+static void sciconv_read_add(int new_type, PyObject * (*func)(char*))
+{
+ struct sciconv_read_struct *new_conv = \
+ (struct sciconv_read_struct*) malloc(sizeof(struct sciconv_read_struct)) ;
+
+ new_conv->scitype = new_type ;
+ new_conv->conv_func = func ;
+
+ if (sciconv_read_list == NULL)
+ {
+ sciconv_read_list = new_conv ;
+ new_conv->next = NULL ;
+ return ;
+ }
+
+ new_conv->next = sciconv_read_list->next ;
+ sciconv_read_list->next = new_conv ;
+}
+
+/**
+ * Initialization
+ * Add all the known converters to the list
+*/
+void sciconv_read_init(void)
+{
+ // Most used should come last
+ sciconv_read_add(16, read_tlist) ;
+ sciconv_read_add(10, read_string) ;
+ sciconv_read_add(1, read_matrix) ;
+
+}
diff --git a/sciconv_read.h b/sciconv_read.h
new file mode 100755
index 0000000..af47eab
--- /dev/null
+++ b/sciconv_read.h
@@ -0,0 +1,47 @@
+/*
+ This file is part of Sciscipy.
+
+ Sciscipy 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.
+
+ Sciscipy 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2009, Vincent Guffens.
+*/
+
+
+
+
+#ifndef SCICONV_READ
+#define SCICONV_READ
+
+#include <Python.h>
+
+#include "util.h"
+#if NUMPY == 1
+#include "numpy/arrayobject.h"
+#endif
+
+struct sciconv_read_struct
+{
+ PyObject * (*conv_func)(int *) ;
+ int scitype ;
+ struct sciconv_read_struct *next ;
+} ;
+
+// List of converter functions
+extern struct sciconv_read_struct* sciconv_read_list ;
+
+void sciconv_read_init(void) ;
+// Generic read a scilab variable given its address and type
+PyObject * sciconv_read (int *addr, int var_type) ;
+
+#endif
diff --git a/sciconv_write.c b/sciconv_write.c
new file mode 100755
index 0000000..45844ba
--- /dev/null
+++ b/sciconv_write.c
@@ -0,0 +1,604 @@
+/*
+ This file is part of Sciscipy.
+
+ Sciscipy 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.
+
+ Sciscipy 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2009, Vincent Guffens.
+*/
+
+#include "sciconv_write.h"
+#include "util.h"
+#include "Scierror.h"
+
+struct sciconv_write_struct *sciconv_write_list = NULL ;
+
+/** list of string
+ *
+ * WARNING: This will not work with Python 3.0
+ */
+static int write_listofstring(char *name, PyObject *obj)
+{
+ int i, n ;
+ int tot_size = 0;
+ PyObject *item ;
+ char *str_item, *buff, *ptr ;
+
+ if (!PyList_Check(obj))
+ {
+ obj = create_list(obj) ;
+ }
+
+ n = PyList_Size(obj) ;
+
+ for (i = 0; i < n; ++i)
+ {
+ item = PyList_GetItem(obj, i) ;
+ str_item = PyString_AsString(item) ;
+ tot_size += strlen(str_item) ;
+ }
+
+ buff = (char *) malloc((strlen(name) + tot_size + 3 * n + 3) * sizeof(char)) ;
+ ptr = buff ;
+ strcpy(ptr, name) ;
+ ptr += strlen(name) ;
+
+ strcpy(ptr, "=[") ;
+ ptr += 2 ;
+
+ for (i = 0; i < n; ++i)
+ {
+ item = PyList_GetItem(obj, i) ;
+ str_item = PyString_AsString(item) ;
+ strcpy(ptr, "'") ;
+ ptr++ ;
+ strcpy(ptr, str_item) ;
+ ptr += strlen(str_item) ;
+ strcpy(ptr, "'") ;
+ ptr++ ;
+ if (i != n - 1)
+ {
+ strcpy(ptr, ",") ;
+ ptr++ ;
+ }
+ }
+
+ strcpy(ptr, "]") ;
+ SendScilabJob(buff);
+
+ return 1 ;
+}
+
+/**
+ */
+static int test_listofstring(PyObject *obj)
+{
+ PyObject *item ;
+ int n ;
+
+ if (PyString_Check(obj))
+ {
+ sci_debug("[sciconv_write] Match for list of string\n") ;
+ return 1 ;
+ }
+
+ if (PyList_Check(obj))
+ {
+ n = PyList_Size(obj) ;
+ if (n == 0)
+ {
+ return -1 ;
+ }
+
+ item = PyList_GetItem(obj, 0) ;
+
+ if (PyString_Check(item))
+ {
+ sci_debug("[sciconv_write] Match for list of string\n") ;
+ return 1 ;
+ }
+ }
+
+ return -1 ;
+}
+
+/**
+ * @param name: the name of the scilab variable we want to create
+ * @return: negative on failure
+*/
+static int write_listoflist(char *name, PyObject *obj)
+{
+ int i, j, m, n ;
+ double *new_vec ;
+ double *new_vec_img ;
+ PyObject *item, *element ;
+ int is_complex_found = 0 ;
+ SciErr sciErr;
+
+ m = PyList_Size(obj) ;
+ item = PyList_GetItem(obj, 0) ;
+ n = PyList_Size(item) ;
+
+ new_vec = (double*) calloc(sizeof(double) * m * n, 1) ;
+ if (!new_vec)
+ {
+ return -1 ;
+ }
+
+ new_vec_img = (double*) calloc(sizeof(double) * m * n, 1) ;
+ if (!new_vec_img)
+ {
+ free(new_vec);
+ return -1 ;
+ }
+
+ for (i = 0; i < m; i++)
+ {
+ item = PyList_GetItem(obj, i) ;
+
+ for (j = 0; j < n; j++)
+ {
+ element = PyList_GetItem(item, j) ;
+
+ if (PyComplex_Check(element))
+ {
+ is_complex_found = 1 ;
+ new_vec[j * m + i] = PyComplex_RealAsDouble(element) ;
+ new_vec_img[j * m + i] = PyComplex_ImagAsDouble(element) ;
+ continue ;
+ }
+
+ if (PyFloat_Check(element) || PyLong_Check(element) || PyInt_Check(element))
+ {
+ new_vec[j * m + i] = PyFloat_AsDouble(element) ;
+ continue ;
+ }
+
+ sci_debug("[write_listoflist] something found" \
+ "that is not real or complex") ;
+ free(new_vec) ;
+ free(new_vec_img) ;
+ return -1 ;
+ }
+ }
+
+ if (is_complex_found)
+ {
+ sciErr = createNamedComplexMatrixOfDouble(pvApiCtx, name, m, n, new_vec, new_vec_img);
+ free(new_vec_img);
+ free(new_vec);
+ if (sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ Scierror(999, "Cannot create complex variable '%s'.\n", name);
+ return 0;
+ }
+
+ }
+ else
+ {
+ sciErr = createNamedMatrixOfDouble(pvApiCtx, name, m, n, new_vec);
+ free(new_vec) ;
+ free(new_vec_img) ;
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, "Error in Writematrix");
+ return 0;
+ }
+ }
+ return 1 ;
+}
+
+static int test_listoflist(PyObject *obj)
+{
+ int n ;
+ PyObject *item, *el ;
+
+
+ if (!PyList_Check(obj))
+ {
+ return -1 ;
+ }
+ n = PyList_Size(obj) ;
+ if (n == 0)
+ {
+ return -1 ;
+ }
+
+ item = PyList_GetItem(obj, 0) ;
+
+ if (!PyList_Check(item) || PyList_Size(item) == 0)
+ {
+ return -1 ;
+ }
+
+ el = PyList_GetItem(item, 0) ;
+
+ /* Only the first element is checked, the converter
+ will fail later on if all items are not real or
+ complex (This is for performance)
+ */
+ if (PyFloat_Check(el) || PyLong_Check(el) || PyComplex_Check(el) || PyInt_Check(el))
+ {
+ sci_debug("[sciconv_write] Match for list of list\n") ;
+ return 1 ;
+ }
+ else
+ {
+ return -1 ;
+ }
+}
+
+static int write_listofdouble(char *name, PyObject *obj)
+{
+ int i, m ;
+ int n = 1 ;
+ double *new_vec ;
+ double *new_vec_img ;
+ PyObject *element ;
+ int is_complex_found = 0 ;
+ SciErr sciErr;
+
+ if (!PyList_Check(obj))
+ {
+ obj = create_list(obj) ;
+ }
+
+ m = PyList_Size(obj) ;
+
+ new_vec = (double*) calloc(sizeof(double) * m, 1) ;
+
+ if (!new_vec)
+ {
+ return -1 ;
+ }
+
+ new_vec_img = (double*) calloc(sizeof(double) * m, 1) ;
+
+ if (!new_vec_img)
+ {
+ free(new_vec);
+ return -1 ;
+ }
+
+ for (i = 0; i < m; i++)
+ {
+ element = PyList_GetItem(obj, i) ;
+
+ if (PyComplex_Check(element))
+ {
+ is_complex_found = 1 ;
+ new_vec[i] = PyComplex_RealAsDouble(element) ;
+ new_vec_img[i] = PyComplex_ImagAsDouble(element) ;
+ continue ;
+ }
+
+ if (PyFloat_Check(element) || PyLong_Check(element) || PyInt_Check(element))
+ {
+ new_vec[i] = PyFloat_AsDouble(element) ;
+ continue ;
+ }
+
+ sci_debug("[write_listofdouble] something found" \
+ "that is not real or complex") ;
+ free(new_vec) ;
+ free(new_vec_img) ;
+ return -1 ;
+ }
+
+
+ if (is_complex_found)
+ {
+ sciErr = createNamedComplexMatrixOfDouble(pvApiCtx, name, n, m, new_vec, new_vec_img);
+ free(new_vec);
+ free(new_vec_img);
+ if (sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ Scierror(999, "Cannot create complex variable '%s'.\n", name);
+ return 0;
+ }
+ }
+ else
+ {
+ sciErr = createNamedMatrixOfDouble(pvApiCtx, name, n, m, new_vec);
+ free(new_vec);
+ free(new_vec_img);
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, "Error in Writematrix") ;
+ return 0;
+ }
+ }
+
+ return 1 ;
+
+}
+
+static int test_listofdouble(PyObject *obj)
+{
+ PyObject *item ;
+ int n ;
+
+ if (PyFloat_Check(obj) || PyLong_Check(obj) || PyComplex_Check(obj) || PyInt_Check(obj))
+ {
+ sci_debug("[sciconv_write] Match for list of double\n") ;
+ return 1 ;
+ }
+
+ if (PyList_Check(obj))
+ {
+ n = PyList_Size(obj) ;
+ if (n == 0)
+ {
+ return -1 ;
+ }
+
+ item = PyList_GetItem(obj, 0) ;
+
+ if (PyFloat_Check(item) || PyLong_Check(item) || PyComplex_Check(item) || PyInt_Check(item))
+ {
+ sci_debug("[sciconv_write] Match for list of double\n") ;
+ return 1 ;
+ }
+ }
+
+ return -1 ;
+}
+
+#if NUMPY == 1
+static int write_numpy(char *name, PyObject *obj)
+{
+
+ PyArrayObject * array = (PyArrayObject *) obj ;
+ double * data ;
+ double * data_img ;
+ int i, j, m, n ;
+ complex * item ;
+ SciErr sciErr;
+
+ // TODO: add support for 1D array
+
+ if (array->nd != 1 && array->nd != 2)
+ {
+ sci_debug("[sciconv_write] Only 1D and 2D array are supported\n") ;
+ return -1 ;
+ }
+
+ if (array->nd == 1)
+ {
+ m = array->dimensions[0] ;
+ n = 1 ;
+ }
+ else
+ {
+ m = array->dimensions[0] ;
+ n = array->dimensions[1] ;
+ }
+
+ if ((array->descr->type_num == PyArray_DOUBLE) || \
+ (array->descr->type_num == PyArray_INT) )
+ {
+
+ data = (double*) malloc(m * n * sizeof(double)) ;
+
+ if (!data)
+ {
+ sci_error("[sciconv_write] out of memory\n") ;
+ return -1 ;
+ }
+
+ for (i = 0; i < m ; i++)
+ for (j = 0; j < n ; j++)
+ data[j * m + i] = *(double*)(array->data + i * array->strides[0] + \
+ j * array->strides[1]) ;
+
+ sciErr = createNamedMatrixOfDouble(pvApiCtx, name, m, n, data);
+ free(data);
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, "Error in Writematrix") ;
+ return 0;
+ }
+
+ return 1 ;
+ }
+
+ if (array->descr->type_num == PyArray_CDOUBLE)
+ {
+ data = (double*) malloc(m * n * sizeof(double)) ;
+ data_img = (double*) malloc(m * n * sizeof(double)) ;
+
+ if (!data)
+ {
+ sci_error("[sciconv_write] out of memory\n") ;
+ free(data_img);
+ return -1 ;
+ }
+
+ for (i = 0; i < m ; i++)
+ for (j = 0; j < n ; j++)
+ {
+
+ item = (complex*)(array->data + i * array->strides[0] + \
+ j * array->strides[1]) ;
+ data[j * m + i] = (*item)[0] ;
+ data_img[j * m + i] = (*item)[1] ;
+ }
+
+ sciErr = createNamedComplexMatrixOfDouble(pvApiCtx, name, m, n, data, data_img);
+ if (sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ free(data);
+ free(data_img);
+ Scierror(999, "Cannot create complex variable '%s'.\n", name);
+ return 0;
+ }
+
+
+ free(data) ;
+ free(data_img) ;
+ return 1 ;
+ }
+
+ sci_debug("[sciconv_write] Array type not supported\n") ;
+ return -1 ;
+}
+
+static int test_numpy(PyObject *obj)
+{
+ if (PyArray_Check(obj))
+ {
+ sci_debug("[sciconv_write] Match for numpy array\n") ;
+ return 1 ;
+ }
+ else
+ {
+ return -1 ;
+ }
+}
+#endif
+
+static int write_tlist(char *name, PyObject *obj)
+{
+ int nb_item ;
+ int *tlist_address ;
+ SciErr sciErr ;
+ nb_item = PyDict_Size(obj) - 1 ;
+ sciErr = createNamedTList(pvApiCtx, name, nb_item, &tlist_address) ;
+ PyObject *key, *value;
+ Py_ssize_t pos = 0;
+ PyObject *py_str_to_create = PyString_FromString("[") ;
+ PyObject *py_value_str = PyString_FromString("") ;
+ printf("Entering write 1\n") ;
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, getErrorMessage(sciErr)) ;
+ return -1;
+ }
+ printf("Entering write 2\n") ;
+
+ // py_str_tocreate =
+ // ['a_name', 'var1', ..., 'varN']
+ while (PyDict_Next(obj, &pos, &key, &value))
+ {
+ char *str_key = NULL ;
+ if (!PyString_Check(key))
+ {
+ return -1 ;
+ }
+
+ str_key = PyString_AsString(key) ;
+
+ if (strcmp(str_key, TLIST_NAME) == 0)
+ {
+ if (!PyString_Check(value))
+ {
+ return -1 ;
+ }
+ PyString_Concat(&py_str_to_create, PyString_FromString("\"")) ;
+ PyString_Concat(&py_str_to_create, value) ;
+ PyString_Concat(&py_str_to_create, PyString_FromString("\"")) ;
+ }
+ printf("Entering write i\n") ;
+ }
+ printf("Entering write 3\n") ;
+ pos = 0 ;
+ while (PyDict_Next(obj, &pos, &key, &value))
+ {
+ char *str_key = NULL ;
+ if (!PyString_Check(key))
+ {
+ return -1 ;
+ }
+
+ str_key = PyString_AsString(key) ;
+ if (strcmp(str_key, TLIST_NAME) != 0)
+ {
+ char rnd_name[BUFSIZE] ;
+ PyString_Concat(&py_str_to_create, PyString_FromString(",\"")) ;
+ PyString_Concat(&py_str_to_create, key) ;
+ PyString_Concat(&py_str_to_create, PyString_FromString("\"")) ;
+ // TODO
+ // write(rnd_name, value)
+ snprintf(rnd_name, BUFSIZE - 1, ",rnd_var__%i", rand()) ;
+ PyString_Concat(&py_value_str, PyString_FromString(rnd_name)) ;
+ }
+ }
+ PyString_Concat(&py_str_to_create, PyString_FromString("]")) ;
+ printf("%s = tlist(%s%s)\n", name, PyString_AsString(py_str_to_create), PyString_AsString(py_value_str)) ;
+ // creates a string name = tlist(['a_name', 'var1', ..., 'varN'], var1,..., varN)
+ // eval the string
+
+ return 1 ;
+}
+
+static int test_dict_tlist(PyObject *obj)
+{
+ PyObject *py_list_name = PyString_FromString(TLIST_NAME) ;
+ if (PyDict_Check(obj) && PyDict_Contains(obj, py_list_name))
+ {
+ sci_debug("[sciconv_write] Match for tlist\n") ;
+ Py_DECREF(py_list_name) ;
+ return 1 ;
+ }
+ else
+ {
+ Py_DECREF(py_list_name) ;
+ return -1 ;
+ }
+}
+
+
+/**
+ * Add a new converter to the list
+ * @param new_type: A scilab type number
+ * @param func: The converter function
+*/
+static void sciconv_write_add(int (*test_func)(PyObject*), int(*func)(char*, PyObject *), WRITETYPE_t id)
+{
+ struct sciconv_write_struct *new_conv = \
+ (struct sciconv_write_struct*) malloc(sizeof(struct sciconv_write_struct)) ;
+
+ new_conv->test_func = test_func ;
+ new_conv->conv_func = func ;
+ new_conv->write_type = id ;
+ if (sciconv_write_list == NULL)
+ {
+ sciconv_write_list = new_conv ;
+ new_conv->next = NULL ;
+ return ;
+ }
+
+ new_conv->next = sciconv_write_list->next ;
+ sciconv_write_list->next = new_conv ;
+}
+
+/**
+ * Initialization
+ * Add all the known converter to the list
+*/
+void sciconv_write_init(void)
+{
+ // The one added first is the one tested first
+ // so the order can be important
+#if NUMPY == 1
+ sciconv_write_add(test_numpy, write_numpy, NUMPY_ARRAY) ;
+#endif
+ sciconv_write_add(test_listoflist, write_listoflist, LISTOFLIST) ;
+ sciconv_write_add(test_listofdouble, write_listofdouble, LISTOFDOUBLE) ;
+ sciconv_write_add(test_listofstring, write_listofstring, LISTOFSTRING) ;
+ sciconv_write_add(test_dict_tlist, write_tlist, TLIST) ;
+}
+
diff --git a/sciconv_write.h b/sciconv_write.h
new file mode 100755
index 0000000..e9569d6
--- /dev/null
+++ b/sciconv_write.h
@@ -0,0 +1,53 @@
+/*
+ This file is part of Sciscipy.
+
+ Sciscipy 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.
+
+ Foobar 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2009, Vincent Guffens.
+*/
+
+#ifndef SCICONV_WRITE
+#define SCICONV_WRITE
+
+#include <Python.h>
+
+#if NUMPY == 1
+#include "util.h"
+#include "numpy/arrayobject.h"
+#endif
+
+typedef enum { NUMPY_ARRAY,
+ LISTOFLIST,
+ LISTOFDOUBLE,
+ LISTOFSTRING,
+ TLIST
+ } WRITETYPE_t ;
+
+
+struct sciconv_write_struct
+{
+ int (*conv_func)(char*, PyObject*) ; // Create a new variable in scilab
+ int (*test_func)(PyObject*) ; // Return one if this structure can handle the PyObject
+ WRITETYPE_t write_type ; // Identifier for the type
+ struct sciconv_write_struct *next ;
+} ;
+
+// List of converter functions
+extern struct sciconv_write_struct* sciconv_write_list ;
+
+void sciconv_write_init(void) ;
+
+
+
+#endif
diff --git a/scilab.cfg b/scilab.cfg
new file mode 100644
index 0000000..84f9ac3
--- /dev/null
+++ b/scilab.cfg
@@ -0,0 +1,15 @@
+[KNOWN FUNC]
+size : 1
+find : 1
+disp : 0
+
+bdiag : 3
+
+banner : 0
+
+exec : 1
+
+plot2d : 0
+
+scf : 0
+xs2gif : 0 \ No newline at end of file
diff --git a/scilab.py b/scilab.py
new file mode 100644
index 0000000..ee906f8
--- /dev/null
+++ b/scilab.py
@@ -0,0 +1,262 @@
+"""
+ This file is part of Sciscipy.
+
+ Sciscipy 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.
+
+ Sciscipy 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2009, Vincent Guffens.
+
+
+scilab module
+=============
+
+Provide an easy to use interface toward scilab
+
+Usage:
+>>> from scilab import scilab as sci
+>>> x = [1,2,3]
+>>> sci.disp(x)
+
+ 1.
+ 2.
+ 3.
+
+With the help of the sciscipy module, you can also do:
+
+>>> sciscipy.eval("function y = func(x) ; y = x*x ; endfunction")
+>>> sci.func(2)
+array([ 4.])
+
+
+Internals
+=========
+
+It uses macrovar ou fun2string to discover the number of
+output args
+
+
+@author: vincent.guffens@gmail.com
+"""
+
+from sciscipy import write, read, eval
+from threading import Thread
+from ConfigParser import ConfigParser
+
+import os
+import sys
+import time
+
+DFLT_CONFIG = "scilab.cfg"
+SECTION_CONFIG = "KNOWN FUNC"
+
+# Type 130 functions do not
+# work with macrovar so their
+# output vars is hardcoded here
+__known_func = {}
+
+
+class ScilabError(Exception):
+ """ Define an exception class """
+ pass
+
+def update_scilab_func(filename = None):
+ """
+ Look for filename and update the dictionary L{__known_func}
+ filename is a python config file
+ """
+ assert isinstance(filename, (type(None), str)), "Wrong filename"
+
+ # Search first in the current path
+ if filename == None and os.path.isfile(DFLT_CONFIG):
+ filename = os.path.join (DFLT_CONFIG)
+
+ # Search here too: share/sciscipy/scilab.cfg
+ if filename == None:
+ filename = os.path.join (os.path.dirname(__file__), "..", "..", "..", "share", "sciscipy", DFLT_CONFIG)
+
+ if filename == None:
+ filename = os.path.join (sys.prefix, 'share', 'sciscipy', DFLT_CONFIG)
+
+
+ if not os.path.exists(filename):
+ raise ValueError, "can not open file: " + filename
+
+ parser = ConfigParser()
+ parser.read(filename)
+
+ if not parser.has_section(SECTION_CONFIG):
+ raise ValueError, "Invalid config file"
+
+ items = parser.items(SECTION_CONFIG)
+
+ for new_func, value in items:
+ __known_func[new_func] = int(value)
+
+
+def run_scilab_cmd(cmd_str):
+ """ Defines the Scilab start command (with error handle) """
+ new_cmd = "_ier_ = execstr('%s', 'errcatch'); _er_msg_ = lasterror() ;" % cmd_str
+ eval(new_cmd)
+ ier = read("_ier_")
+ if ier != 0 and ier != [0]:
+ lasterror = read("_er_msg_")
+ raise ScilabError, lasterror
+
+
+def find_scilab_type(var_name):
+ """
+ Find the scilab type of var_name
+
+ @param var_name: name of a scilab variable
+ @type var_name: string
+ @return: type(var_name)
+ """
+ if type(var_name) != type(""):
+ raise TypeError, "var_name must be a string"
+
+ run_scilab_cmd("_tmp1_ = type(" + var_name + ")")
+ res = read("_tmp1_")
+ eval("clear _tmp1_")
+
+ return res[0]
+
+def find_output_param(macro_name):
+ """
+ Find out the number of output param of macro_name
+
+
+ First we look in the __known_func dico to see
+ if we have a special case for that macro. If not,
+ we use macrovar for type 13 functions. Otherwise,
+ we return 1.
+
+ @param macro_name: the name of a scilab macro
+ @type macro_name: string
+ @return: number of ouput param of macro_name
+ @rtype: integer
+ """
+ if type(macro_name) != type(""):
+ raise TypeError, "macro_name must be a string"
+
+ if macro_name in __known_func.keys():
+ return __known_func[macro_name]
+
+ if find_scilab_type(macro_name) == 13:
+ eval("_tmp1_ = macrovar(" + macro_name + ");")
+ eval("_tmp2_ = length(length(_tmp1_(2)))")
+ res = read("_tmp2_")
+ eval("clear _tmp1_, _tmp2_")
+ return int(res[0])
+
+ return 1
+
+
+class Functor(object):
+ """
+ The attribute 'name' is the name
+ of the function to call in scilab
+ """
+
+ def __init__(self, name):
+ if type(name) != type(""):
+ raise TypeError, "name must be a string"
+
+ self.name = name
+
+ def __call__(self, *args):
+ """
+ TODO: add a named argument outp=...
+ if you want to force the number of output arguments
+ """
+ cmd = self.name + "("
+
+ in_args = []
+ for (i, arg) in enumerate(args):
+ arg_name = "__arg" + str(i)
+ in_args += [arg_name]
+ write(arg_name, arg)
+
+ out = find_output_param(self.name)
+
+ out_args = []
+ for i in range(out):
+ out_args += ["__out" + str(i)]
+
+ if out != 0:
+ cmd = "[%s] = %s(%s)" % (",".join(out_args),
+ self.name,
+ ",".join(in_args))
+ else:
+ cmd = "%s(%s)" % (self.name, ",".join(in_args))
+
+
+ run_scilab_cmd(cmd)
+
+ if out == 0:
+ return None
+
+ res = []
+ for i in range(out):
+ item = read("__out" + str(i))
+ res += [item]
+
+ if len(res) == 1:
+ return res[0]
+ else:
+ return tuple(res)
+
+
+class Scilab(object):
+ """
+ This class can call any scilab function (yeah!)
+
+ Just instanciate an object of this class and call any
+ method to call equivalent scilab function.
+
+ >>> sci = Scilab()
+ >>> from scilab import Scilab
+ >>> sci = Scilab()
+ >>> sci.zeros(2,2)
+ [[0.0, 0.0], [0.0, 0.0]]
+ >>>
+ """
+
+ def __getattr__(self, name):
+ return Functor(name)
+
+class ScilabThread(Thread):
+ """ Defines the Scilab thread to start """
+ def __init__(self, func):
+ Thread.__init__(self)
+ self.func = func
+ self.daemon = True
+
+ def run(self):
+ self.func()
+
+def scipoll():
+ HOW_LONG = 0.1 # sec
+ while 1:
+ eval("")
+ time.sleep(HOW_LONG)
+
+
+# Update the dictionary
+update_scilab_func()
+
+# Create a convenience Scilab object
+scilab = Scilab()
+
+# Run the polling thread
+poll_thread = ScilabThread(scipoll)
+poll_thread.start()
diff --git a/sciscipy.c b/sciscipy.c
new file mode 100755
index 0000000..7eb67d4
--- /dev/null
+++ b/sciscipy.c
@@ -0,0 +1,208 @@
+/*
+ This file is part of Sciscipy.
+
+ Sciscipy 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.
+
+ Sciscipy 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
+
+ Copyright (c) 2009, Vincent Guffens.
+*/
+#include <Python.h>
+
+#include "sciconv_read.h"
+#include "sciconv_write.h"
+#include "util.h"
+#include "deallocator.h"
+#include "call_scilab.h"
+
+static int Initialize(void)
+{
+ int res ;
+#ifdef _MSC_VER
+ res = StartScilab(NULL, NULL, 0) == FALSE ;
+#else
+ if (getenv("SCI") != NULL)
+ {
+ res = StartScilab(getenv("SCI"), NULL, 0) ;
+ }
+ else
+ {
+ char sci[sci_max_len] ;
+ res = StartScilab(get_SCI(sci), NULL, 0) ;
+ }
+#endif
+
+ if (res == FALSE)
+ {
+ return -1;
+ }
+ else
+ {
+ return 0 ;
+ }
+}
+
+/* Python interface */
+
+static PyObject *
+sciscipy_read (PyObject *self, PyObject *args)
+{
+ char *name ;
+ SciErr sciErr ;
+
+ int var_type ;
+ int *addr ;
+
+ if ( !PyArg_ParseTuple (args, "s", &name) )
+ {
+ PyErr_SetString(PyExc_TypeError, "argument must be a string") ;
+ return NULL ;
+ }
+ var_type = read_sci_type(name) ;
+ sciErr = getVarAddressFromName(pvApiCtx, name, &addr) ;
+ if (sciErr.iErr)
+ {
+ PyErr_SetString(PyExc_TypeError, getErrorMessage(sciErr)) ;
+ return 0;
+ }
+
+ return sciconv_read (addr, var_type) ;
+
+} ;
+
+static PyObject *
+sciscipy_write (PyObject *self, PyObject *args)
+{
+ char *name ;
+ PyObject *obj ;
+ int er ;
+ struct sciconv_write_struct *conv ;
+
+ if (!PyArg_ParseTuple (args, "sO", &name, &obj))
+ {
+ return NULL ;
+ }
+
+ Py_INCREF(Py_None) ;
+ conv = sciconv_write_list ;
+
+ while (conv)
+ {
+ if (conv->test_func(obj) > 0)
+ {
+ er = conv->conv_func(name, obj) ;
+ if (er > 0) // success
+ {
+ return Py_None ;
+ }
+ }
+ conv = conv->next ;
+ }
+
+ return Py_None ;
+} ;
+
+static PyObject *
+sciscipy_eval (PyObject *self, PyObject *args)
+{
+
+ char *name ;
+
+ if ( !PyArg_ParseTuple (args, "s", &name) )
+ {
+ return NULL ;
+ }
+
+ SendScilabJob(name);
+
+ // while ( ScilabHaveAGraph() )
+ // {
+ // Py_BEGIN_ALLOW_THREADS
+ // ScilabDoOneEvent() ;
+ // Py_END_ALLOW_THREADS
+ // }
+
+ Py_INCREF(Py_None);
+ return Py_None;
+
+} ;
+
+static void numpy_init(void)
+{
+#if NUMPY == 1
+ import_array() ;
+#endif
+}
+
+static PyMethodDef SciscipyMethods[] =
+{
+ {"eval", sciscipy_eval, METH_VARARGS, "eval (cmd) : Execute the Scilab command cmd."},
+ {"read", sciscipy_read, METH_VARARGS, "read (sci_name): read a Scilab variable."},
+ {"write", sciscipy_write, METH_VARARGS, "write (sci_name, py_var): Write a Scilab variable."},
+ {NULL, NULL, 0, NULL} /* Sentinel */
+} ;
+
+#ifdef PYTHON3
+static struct PyModuleDef sciscipy =
+{
+ PyModuleDef_HEAD_INIT,
+ "sciscipy", /* name of module */
+ NULL, /* module documentation, may be NULL */
+ -1, /* size of per-interpreter state of the module,
+ or -1 if the module keeps state in global variables. */
+ SciscipyMethods
+} ;
+#endif
+
+PyMODINIT_FUNC
+#ifdef PYTHON3
+PyInit_sciscipy(void)
+#else
+initsciscipy(void)
+#endif
+{
+
+ int er = Initialize() ;
+ if (er != 0)
+ {
+ PyErr_SetString(PyExc_TypeError, "Can not initialize scilab") ;
+
+#ifdef PYTHON3
+ return NULL ;
+#endif
+ }
+ else
+ {
+ numpy_init() ;
+ sciconv_read_init() ;
+ sciconv_write_init() ;
+
+#if NUMPY == 1
+ _MyDeallocType.tp_new = PyType_GenericNew ;
+ if (PyType_Ready(&_MyDeallocType) < 0)
+ {
+ PyErr_SetString(PyExc_TypeError, "Can not initialize deallocator") ;
+ }
+
+ Py_INCREF(&_MyDeallocType);
+#endif
+
+
+#ifdef PYTHON3
+ return PyModule_Create(&sciscipy) ;
+#else
+ Py_InitModule("sciscipy", SciscipyMethods) ;
+
+#endif
+
+ }
+} ;
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..e4b5da2
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python
+
+from distutils.core import setup, Extension, Command
+from unittest import TextTestRunner, TestLoader
+from glob import glob
+from os.path import splitext, basename, join as pjoin
+import os, sys
+
+# This should be customized for specific instals
+
+if os.name == 'nt':
+ common_include_base = r"C:\Program Files (x86)\scilab-5.2.1\modules"
+ sci_include = [
+ os.path.join(common_include_base, "core", "includes"),
+ os.path.join(common_include_base, "call_scilab", "includes"),
+ os.path.join(common_include_base, "api_scilab", "includes")
+ ]
+
+ sci_lib_dir = [r"C:\Program Files (x86)\scilab-5.2.1\bin"]
+ sci_librairies = ['LibScilab', 'api_scilab']
+
+elif os.name == 'posix':
+ common_include_base = os.path.join("/","usr", "include", "scilab")
+ sci_include = [ common_include_base,
+ os.path.join(common_include_base, "core"),
+ os.path.join(common_include_base, "call_scilab")
+ ]
+ sci_lib_dir = [os.path.join("/","usr", "lib", "scilab")]
+ sci_librairies = ['scilab']
+ sci_extra_link_args = ['-Wl,--no-as-needed']
+else:
+ raise NotImplementedError, "Only 'nt' and 'posix' are supported"
+
+sci_sources = ['sciscipy.c', 'sciconv_read.c', 'sciconv_write.c', 'util.c']
+
+if os.environ.get('SCI'):
+ common_include_base_call=os.path.join("/",os.environ.get('SCI'),"..","..","include","scilab")
+ sci_include.append(os.path.join("/", common_include_base_call))
+ sci_include.append(os.path.join("/", common_include_base_call, "core"))
+ sci_include.append(os.path.join("/",common_include_base_call, "call_scilab"))
+ sci_lib_dir.append(os.path.join("/",os.environ.get('SCI'),"..","..","lib","scilab"))
+
+
+sci_install = os.path.join("/", "usr", "local", "share", "scilab")
+
+list_of_macros = [('SCI', '"' + sci_install + '"'), ('SCIDEBUG', 0)]
+
+# Test for python version
+if sys.version_info[0] >= 3:
+ list_of_macros += [('PYTHON3', 1)]
+
+# Test for numpy
+try:
+ import numpy
+ import numpy.distutils.misc_util as misc
+ sci_include += os.path.join(misc.get_numpy_include_dirs())
+ numpy_is_avail = 1
+ sci_sources += ['deallocator.c']
+except ImportError:
+ numpy_is_avail = 0
+
+list_of_macros += [('NUMPY', numpy_is_avail)]
+
+
+class TestCommand(Command):
+ user_options = [ ]
+
+ def initialize_options(self):
+ self._dir = os.getcwd()
+
+ def finalize_options(self):
+ pass
+
+ def run(self):
+ '''
+ Finds all the tests modules in test/, and runs them.
+ '''
+ testfiles = [ ]
+ for t in glob(pjoin(self._dir, 'tests', '*.py')):
+ if not t.endswith('__init__.py'):
+ testfiles.append('.'.join(
+ ['tests', splitext(basename(t))[0]])
+ )
+
+ print(testfiles)
+ tests = TestLoader().loadTestsFromNames(testfiles)
+ t = TextTestRunner(verbosity = 2)
+ t.run(tests)
+
+module1 = Extension('sciscipy',
+ sources = sci_sources,
+ include_dirs = sci_include,
+ libraries = sci_librairies,
+ library_dirs = sci_lib_dir,
+ extra_link_args = sci_extra_link_args,
+ define_macros = list_of_macros
+)
+
+long_description = r"""
+The goal of sciscipy is to give an access to Scilab features inside python.
+
+from scilab import Scilab
+sci = Scilab()
+
+x = sci.rand(20, 20)
+y = x*x.transpose()
+y_inv = sci.inv(y)
+
+The function func in sci.func(x, y) can be a Scilab built-in or any user
+defined function so that Scilab libraries can be reused easily in python.
+"""
+setup ( name = 'sciscipy',
+ version = '1.0.0',
+ author = 'Vincent Guffens <vincent.guffens@gmail.com>, Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>',
+ url = "http://forge.scilab.org/index.php/p/sciscipy/",
+ license = "GPL",
+ description = 'Scilab binding',
+ long_description = long_description,
+ ext_modules = [module1],
+ py_modules = ['scilab'],
+ data_files = [('share/sciscipy', ['scilab.cfg'])],
+ cmdclass = { 'test': TestCommand}
+)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/__init__.py
diff --git a/tests/test_call.py b/tests/test_call.py
new file mode 100644
index 0000000..ef7df97
--- /dev/null
+++ b/tests/test_call.py
@@ -0,0 +1,53 @@
+import unittest
+from scilab import Scilab
+import sciscipy
+
+class test_call(unittest.TestCase):
+ def setUp(self):
+ self.sci = Scilab()
+
+ def test_spec(self):
+ """ [test_call] Testing spec
+ """
+ spec1 = self.sci.spec([[1, 2],[3, 4]])
+ sciscipy.eval("spec1 = spec([1,2;3,4])")
+ spec2 = sciscipy.read("spec1")
+ for l1, l2 in zip(spec1, spec2):
+ self.assertAlmostEqual(l1, l2)
+
+ def test_mean(self):
+ """ [test_call] Testing mean
+ """
+ mean1 = self.sci.mean([[1, 2],[3, 4]])
+ sciscipy.eval("mean1 = mean([1,2;3,4])")
+ mean2 = sciscipy.read("mean1")
+ comp = mean1 == mean2
+ assert(comp)
+
+ def test_strcat(self):
+ """ [test_call] Testing strcat
+ """
+ strcat1 = self.sci.strcat(["1", "4"], "x")
+ sciscipy.eval("strcat1 = strcat(['1', '4'], 'x')")
+ strcat2 = sciscipy.read("strcat1")
+ comp = strcat1 == strcat2
+ assert(comp)
+
+
+ def test_length(self):
+ """ [test_call] Testing length
+ """
+ strlength1 = self.sci.length(["3ch","5char","plenty of char"])
+ sciscipy.eval("strlength = length(['3ch','5char','plenty of char'])")
+ strlength2 = sciscipy.read("strlength")
+ for l1, l2 in zip(strlength1, strlength2):
+ self.assertEquals(l1, l2)
+
+
+
+if __name__ == '__main__':
+ unittest.main()
+
+
+
+
diff --git a/tests/test_matrix.py b/tests/test_matrix.py
new file mode 100644
index 0000000..4c5534c
--- /dev/null
+++ b/tests/test_matrix.py
@@ -0,0 +1,71 @@
+import unittest
+import sciscipy as sci
+
+try:
+ import numpy
+ numpy_is_avail = 1
+except ImportError:
+ numpy_is_avail = 0
+
+class test_matrix(unittest.TestCase):
+ def setUp(self):
+ pass
+
+ def test_readwrite1d(self):
+ sci.eval("x=rand(1, 100)")
+ sci.eval("my_sum=sum(x)")
+ x = sci.read("x")
+ my_sum = 0
+ for i in range(len(x)):
+ my_sum += x[i]
+
+ my_other_sum = sci.read("my_sum")
+ assert(my_other_sum[0] == my_sum)
+
+ def test_readwrite1dT(self):
+ sci.eval("x=rand(100, 1)")
+ sci.eval("my_sum=sum(x)")
+ x = sci.read("x")
+ my_sum = 0
+ for i in range(len(x)):
+ my_sum += x[i]
+
+ my_other_sum = sci.read("my_sum")
+ assert(my_other_sum[0] == my_sum)
+
+ def test_readwrite(self):
+ sci.eval("x=[1,2,3 ; 4,5,6]")
+ y = sci.read("x")
+ sci.write("z", y)
+ w = sci.read("z")
+ if numpy_is_avail:
+ assert(numpy.alltrue(numpy.equal(y, w)))
+ else:
+ assert(y == w)
+
+ def test_bigmat(self):
+ sci.eval("x=rand(1000,800)")
+ y = sci.read("x")
+ sci.write("xx", y)
+ sci.eval("dist = sum((x - xx).^2)")
+ dist = sci.read("dist")
+ assert(dist[0] == 0)
+
+ def test_complex(self):
+ sci.eval("x=[1+11*%i, 2+222*%i, 3+333*%i ; 4+444*%i , 5+55*%i, 6+66*%i]")
+ y = sci.read("x")
+ sci.write("z", y)
+ w = sci.read("z")
+
+ if numpy_is_avail:
+ assert(numpy.alltrue(numpy.equal(y, w)))
+ else:
+ assert(y == w)
+
+
+if __name__ == '__main__':
+ unittest.main()
+
+
+
+
diff --git a/tests/test_read.py b/tests/test_read.py
new file mode 100644
index 0000000..1a9b991
--- /dev/null
+++ b/tests/test_read.py
@@ -0,0 +1,23 @@
+import unittest
+from sciscipy import read, eval
+import numpy
+
+try:
+ import numpy
+ numpy_is_avail = 1
+except ImportError:
+ numpy_is_avail = 0
+
+class test_read(unittest.TestCase):
+ def setUp(self):
+ pass
+
+ def test_read_tlist(self):
+ eval("x=tlist(['test','a','b'],12,'item')")
+ x=read('x')
+ if numpy_is_avail:
+ num = numpy.array(12)
+ else:
+ num = 12
+ py_x = {'__tlist_name': 'test', 'a': num, 'b': ['item']}
+ assert x == py_x, str(py_x) + " != tlist(['test','a','b'],12,'item')" \ No newline at end of file
diff --git a/util.c b/util.c
new file mode 100644
index 0000000..57c98c3
--- /dev/null
+++ b/util.c
@@ -0,0 +1,148 @@
+#include "Python.h"
+#include "util.h"
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include "api_scilab.h"
+
+const int sci_max_len = 1024 ;
+static const char* SCI_ETC_FILE = "/etc/sciscilab" ;
+
+
+/** Return the scilab type
+ *
+ * Returns the scilab type of the scilab variable name
+ *
+ * */
+int read_sci_type(char *name)
+{
+ char job[BUFSIZE] ;
+ int m, n ;
+ double type[1] ;
+
+ SciErr sciErr;
+
+ snprintf(job, BUFSIZE, "_tmp_value_ = type(%s);", name) ;
+ SendScilabJob(job) ;
+ sciErr = readNamedMatrixOfDouble(pvApiCtx, "_tmp_value_", &m, &n, NULL);
+ if (sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ }
+
+ if (m*n != 1)
+ {
+ return -1 ;
+ }
+
+
+ sciErr = readNamedMatrixOfDouble(pvApiCtx, "_tmp_value_", &m, &n, &type[0]);
+ if (sciErr.iErr)
+ {
+ printError(&sciErr, 0);
+ }
+
+ return (int) type[0] ;
+} ;
+
+/** Check if a matrix is real or not
+ *
+ * Returns 1 if the matrix is real
+ *
+ */
+int is_real(char *name)
+{
+ return !isNamedVarComplex(pvApiCtx, name);
+}
+
+void sci_debug(const char *format, ...)
+{
+#if SCIDEBUG == 1
+ va_list argp ;
+ va_start(argp, format) ;
+ vprintf(format, argp) ;
+ va_end(argp) ;
+#endif
+}
+
+void sci_error(const char *format, ...)
+{
+ va_list argp ;
+ va_start(argp, format) ;
+ vprintf(format, argp) ;
+ va_end(argp) ;
+}
+
+/** Put a Python object in a list
+ */
+PyObject* create_list(PyObject *obj)
+{
+ PyObject* new_list ;
+
+ new_list = PyList_New(1) ;
+ PyList_SET_ITEM(new_list, 0, obj) ;
+ return new_list ;
+} ;
+
+/** Return the root directory of scilab
+
+Tries to open a file SCI_ETC_FILE and looks
+for a line SCI=where/is/scilab_root
+and return where/is/scilab_root
+
+sci must point to a big enough allocated space
+
+*/
+char *get_SCI(char *sci)
+{
+ FILE* fd = NULL ;
+ char var[sci_max_len] ;
+
+ *sci = '\0' ;
+
+ fd = fopen(SCI_ETC_FILE, "r") ;
+
+ if (!fd)
+ {
+ return sci;
+ }
+ else
+ while (!feof(fd))
+ {
+ char *str = fgets(var, sci_max_len, fd) ;
+ if (str == NULL)
+ {
+ goto finally ;
+ }
+
+ var[sci_max_len - 1] = '\0' ;
+ if (strncmp(var, "SCI", 3) == 0)
+ {
+ char *ptr ;
+ sci = &var[3] ;
+ while (*sci == ' ' || *sci == '=' )
+ {
+ sci++ ;
+ }
+ ptr = sci ;
+ while (*ptr != '\0')
+ if (*ptr == ' ' || *ptr == '\n')
+ {
+ *ptr = '\0' ;
+ }
+ else
+ {
+ ptr++ ;
+ }
+
+ goto finally ;
+ }
+
+ }
+
+finally:
+ fclose(fd) ;
+ return sci ;
+}
+
+
diff --git a/util.h b/util.h
new file mode 100644
index 0000000..4b5611b
--- /dev/null
+++ b/util.h
@@ -0,0 +1,32 @@
+#ifndef _UTIL_H
+#define _UTIL_H
+
+#undef HAVE_STRERROR
+#undef SIZEOF_LONG
+
+#include "call_scilab.h"
+#include "api_scilab.h"
+
+#define BUFSIZE 1024
+
+#define TLIST_NAME "__tlist_name"
+
+/*
+ * This has to be defined when a numpy extension
+ * is split accross multiple files
+ */
+#define PY_ARRAY_UNIQUE_SYMBOL UNIQUE
+
+typedef double complex[2] ;
+
+int read_sci_type(char *name) ;
+int is_real(char *name) ;
+
+void sci_debug(const char *format, ...) ;
+void sci_error(const char *format, ...) ;
+
+PyObject* create_list(PyObject *obj) ;
+char *get_SCI(char*) ;
+extern const int sci_max_len ;
+
+#endif