Recent changes to Home

Home modified by Thomas Natschläger

Thomas Natschläger — Fri, 07 Feb 2014 17:03:21 -0000

--- v11
+++ v12
@@ -11,7 +11,7 @@
 -----

 See the files example/example.i and test/test.i how to use ArmaNpy to generate bindings for a set of classes defined in example/example.hpp and test/test.hpp.
-See example/example.PY and test/armanpy_tests.py for the Python side of usage (note that  armanpy_tests.py is just unit tests).
+See example/example.py and test/armanpy_tests.py for the Python side of usage (note that  armanpy_tests.py is just unit tests).

 How to compile and run the example and the tests?
 -------------------------------------------------

Home modified by Thomas Natschläger

Thomas Natschläger — Fri, 07 Feb 2014 17:02:32 -0000

--- v10
+++ v11
@@ -29,10 +29,18 @@
 cmake .. -DCMAKE_BUILD_TYPE=Release -DARMADILLO_INCLUDE_DIR=/path/to/your/armadillo/include
 cmake --build . --config Release
 cd ..
-python example.py --verbose
+python example.py
+~~~~~~
+
+or 
+
+~~~~~~
+python armanpy_tests.py
 ~~~~~~

 *Note* : The -DCMAKE_BUILD_TYPE=Release is used bcs on Windows a typical Python distribution does not come with the debug version of the Python libraries. Hence, the build would fail for the Debug configuration.
+
+*Remark* : To use 64bit under Windows add e.g. -G "Visual Studio 11 Win64" to the first cmake command.

 Credits
 -------
@@ -43,7 +51,7 @@
 Copyright
 ---------

-Copyright (C) 2012 Thomas Natschläger (thomas.natschlaeger@gmail.com)
+Copyright (C) 2012-2014 Thomas Natschläger (thomas.natschlaeger@gmail.com)

 License
 -------

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Tue, 06 Nov 2012 14:43:23 -0000

--- v9
+++ v10
@@ -10,26 +10,26 @@
 Usage
 -----
 
-See the file test/test.i how to use ArmaNpy to generate bindings for a set of classes defined in test/test.hpp and test/test.cpp<.
-See test/armanpy_tests.py for the Python side of usage (note that this file is just unit tests).
+See the files example/example.i and test/test.i how to use ArmaNpy to generate bindings for a set of classes defined in example/example.hpp and test/test.hpp.
+See example/example.PY and test/armanpy_tests.py for the Python side of usage (note that  armanpy_tests.py is just unit tests).
 
-How to compile and run the test?
---------------------------------
+How to compile and run the example and the tests?
+-------------------------------------------------
 
-1) Use CMake to generate your build system based on the provided CMakeLists file in the test dir.
+1) Use CMake to generate your build system based on the provided CMakeLists file in the example or test dir.
 2) Build the resulting project.
-3) Run the Python script armanpy_tests.py
+3) Run the Python script example.py or armanpy_tests.py
 
-From the command line this can be done as follows (adapt to your path settings and use '\' instead of '/' on Windows):
+From the command line this can be done as follows for the examples (adapt to your path settings and use '\' instead of '/' on Windows). The some holds for the tests:
 
 ~~~~~~
-cd /path/to/armanpy/test
+cd /path/to/armanpy/example
 mkdir build
 cd build
 cmake .. -DCMAKE_BUILD_TYPE=Release -DARMADILLO_INCLUDE_DIR=/path/to/your/armadillo/include
 cmake --build . --config Release
 cd ..
-python armanpy_tests.py --verbose
+python example.py --verbose
 ~~~~~~
 
 *Note* : The -DCMAKE_BUILD_TYPE=Release is used bcs on Windows a typical Python distribution does not come with the debug version of the Python libraries. Hence, the build would fail for the Debug configuration.

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Sun, 04 Nov 2012 17:58:24 -0000

--- v8
+++ v9
@@ -3,23 +3,22 @@
 
 ArmaNpy is a set of SWIG interface files (typemaps) which allows generating Python bindings to C++ code which uses the Armadillo matrix library.
 
-From within Python any Armadillo matrices are represented as NumPy matrices. This is possible due to the same memory layout used. Copying of memory is avoided whenever possible. It also supports boost::shared_ptr wrapped return values of Armadillo matrices.
+From within Python any Armadillo matrices are represented as NumPy matrices. This is possible due to the same memory layout used. Copying of memory is avoided whenever possible. It also supports boost::shared_ptr wrapped return values of Armadillo matrices.
 
 Note that *sparse matrices* are *not supported*.
 
 Usage
 -----
 
-See the file test/test.i how to use ArmaNpy to generate bindings for a set of classes
-defined in test/test.hpp and test/test.cpp.
-See test/armanpy_tests.py for the Python side of usage (note that this file is just unit tests).
+See the file test/test.i how to use ArmaNpy to generate bindings for a set of classes defined in test/test.hpp and test/test.cpp<.
+See test/armanpy_tests.py for the Python side of usage (note that this file is just unit tests).
 
 How to compile and run the test?
 --------------------------------
 
 1) Use CMake to generate your build system based on the provided CMakeLists file in the test dir.
 2) Build the resulting project.
-3) Run the Python script armanpy_tests.py
+3) Run the Python script armanpy_tests.py
 
 From the command line this can be done as follows (adapt to your path settings and use '\' instead of '/' on Windows):
 
@@ -33,9 +32,7 @@
 python armanpy_tests.py --verbose
 ~~~~~~
 
-*Note* : The -DCMAKE_BUILD_TYPE=Release is used bcs on Windows a typical Python distribution does not
-come with the debug version of the Python libraries. Hence, the build would fail for the Debug
-configuration.
+*Note* : The -DCMAKE_BUILD_TYPE=Release is used bcs on Windows a typical Python distribution does not come with the debug version of the Python libraries. Hence, the build would fail for the Debug configuration.
 
 Credits
 -------

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Sun, 04 Nov 2012 17:52:27 -0000

--- v7
+++ v8
@@ -3,8 +3,7 @@
 
 ArmaNpy is a set of SWIG interface files (typemaps) which allows generating Python bindings to C++ code which uses the Armadillo matrix library.
 
-From within Python any Armadillo matrices are represented as NumPy matrices. This is possible due to the same memory layout used. Copying of memory is avoided whenever possible.
-It also supports boost::shared_ptr wrapped return values of Armadillo matrices.
+From within Python any Armadillo matrices are represented as NumPy matrices. This is possible due to the same memory layout used. Copying of memory is avoided whenever possible. It also supports boost::shared_ptr wrapped return values of Armadillo matrices.
 
 Note that *sparse matrices* are *not supported*.

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Sun, 04 Nov 2012 17:51:57 -0000

--- v6
+++ v7
@@ -1,12 +1,12 @@
 What is ArmaNpy?
 ----------------
 
-ArmaNpy is a set of SWIG interface files (typemaps) which allows generating
-Python bindings to C++ code which uses the Armadillo matrix library.
-From within Python any Armadillo matrices are represented as NumPy matrices.
-This is possible due to the same memory layout used.
-Copying of memory is avoided whenever possible.
+ArmaNpy is a set of SWIG interface files (typemaps) which allows generating Python bindings to C++ code which uses the Armadillo matrix library.
+
+From within Python any Armadillo matrices are represented as NumPy matrices. This is possible due to the same memory layout used. Copying of memory is avoided whenever possible.
 It also supports boost::shared_ptr wrapped return values of Armadillo matrices.
+
+Note that *sparse matrices* are *not supported*.
 
 Usage
 -----

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Sun, 04 Nov 2012 17:49:28 -0000

--- v5
+++ v6
@@ -1,19 +1,19 @@
 What is ArmaNpy?
 ----------------
 
-ArmaNpy is a set of SWIG interface files which allows for generating
+ArmaNpy is a set of SWIG interface files (typemaps) which allows generating
 Python bindings to C++ code which uses the Armadillo matrix library.
 From within Python any Armadillo matrices are represented as NumPy matrices.
 This is possible due to the same memory layout used.
 Copying of memory is avoided whenever possible.
-It also supports boost:shared_ptr wrapped return values of Armadillo matrices.
+It also supports boost::shared_ptr wrapped return values of Armadillo matrices.
 
 Usage
 -----
 
 See the file test/test.i how to use ArmaNpy to generate bindings for a set of classes
-defines in test/test.hpp and test/test.cpp.
-See test/armanpy_tests.py for the Python side of usage (Note that this file is jut unit tests).
+defined in test/test.hpp and test/test.cpp.
+See test/armanpy_tests.py for the Python side of usage (note that this file is just unit tests).
 
 How to compile and run the test?
 --------------------------------
@@ -22,7 +22,7 @@
 2) Build the resulting project.
 3) Run the Python script armanpy_tests.py
 
-From the command line this can be done as follows (adapt to your path settings and use '\' instedead of '/' on Windows):
+From the command line this can be done as follows (adapt to your path settings and use '\' instead of '/' on Windows):
 
 ~~~~~~
 cd /path/to/armanpy/test
@@ -34,26 +34,26 @@
 python armanpy_tests.py --verbose
 ~~~~~~
 
-*Note* : The Release build type is used bcs on Windows a typical Python distribution does not
+*Note* : The -DCMAKE_BUILD_TYPE=Release is used bcs on Windows a typical Python distribution does not
 come with the debug version of the Python libraries. Hence, the build would fail for the Debug
 configuration.
 
 Credits
 -------
 
-The idea of wrapping armadillo matrices py NumPy arrays was taken from Michael Forbes`
+The idea of wrapping Armadillo matrices by NumPy arrays was taken from Michael Forbes`
 https://bitbucket.org/mforbes/swig_cpp_python/src/cd7cef820273?at=default.
 
 Copyright
 ---------
 
-Copyright (C) 2008-2012 Thomas Natschläger (thomas.natschlaeger@gmail.com)
+Copyright (C) 2012 Thomas Natschläger (thomas.natschlaeger@gmail.com)
 
 License
 -------
 
 ArmaNpy is provided without any warranty of fitness
-for any purpose. You can redistribute this file
+for any purpose. You can redistribute it
 and/or modify it under the terms of the GNU
 Lesser General Public License (LGPL) as published
 by the Free Software Foundation, either version 3

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Tue, 30 Oct 2012 18:00:47 -0000

--- v4
+++ v5
@@ -6,6 +6,7 @@
 From within Python any Armadillo matrices are represented as NumPy matrices.
 This is possible due to the same memory layout used.
 Copying of memory is avoided whenever possible.
+It also supports boost:shared_ptr wrapped return values of Armadillo matrices.
 
 Usage
 -----
@@ -23,7 +24,7 @@
 
 From the command line this can be done as follows (adapt to your path settings and use '\' instedead of '/' on Windows):
 
-~~~~~~~
+~~~~~~
 cd /path/to/armanpy/test
 mkdir build
 cd build
@@ -31,7 +32,11 @@
 cmake --build . --config Release
 cd ..
 python armanpy_tests.py --verbose
-~~~~~~~
+~~~~~~
+
+*Note* : The Release build type is used bcs on Windows a typical Python distribution does not
+come with the debug version of the Python libraries. Hence, the build would fail for the Debug
+configuration.
 
 Credits
 -------
@@ -42,16 +47,21 @@
 Copyright
 ---------
 
-2012, Thomas Natschläger, thomas.natschlaeger@gmail.com
+Copyright (C) 2008-2012 Thomas Natschläger (thomas.natschlaeger@gmail.com)
 
 License
 -------
 
-This software is distributed under the terms and conditions of the GPL.
+ArmaNpy is provided without any warranty of fitness
+for any purpose. You can redistribute this file
+and/or modify it under the terms of the GNU
+Lesser General Public License (LGPL) as published
+by the Free Software Foundation, either version 3
+of the License or (at your option) any later version.
+(see http://www.opensource.org/licenses for more info)
 
 TODO
 ----
 
 * allow for const arma::Mat< ... > * (should be the same as const arma::Mat< ... > &)
 * allow for arma::Mat< ... > *( should be the same as arma::Mat< ... > &)
-

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Tue, 30 Oct 2012 17:38:20 -0000

--- v3
+++ v4
@@ -23,7 +23,7 @@
 
 From the command line this can be done as follows (adapt to your path settings and use '\' instedead of '/' on Windows):
 
-~~~~
+~~~~~~~
 cd /path/to/armanpy/test
 mkdir build
 cd build
@@ -31,8 +31,7 @@
 cmake --build . --config Release
 cd ..
 python armanpy_tests.py --verbose
-~~~~
-
+~~~~~~~
 
 Credits
 -------

WikiPage Home modified by Thomas Natschläger

Thomas Natschläger — Tue, 30 Oct 2012 17:37:55 -0000

--- v2
+++ v3
@@ -23,6 +23,7 @@
 
 From the command line this can be done as follows (adapt to your path settings and use '\' instedead of '/' on Windows):
 
+~~~~
 cd /path/to/armanpy/test
 mkdir build
 cd build
@@ -30,6 +31,8 @@
 cmake --build . --config Release
 cd ..
 python armanpy_tests.py --verbose
+~~~~
+
 
 Credits
 -------