Skip to content

Commit

Permalink
This is a template file for making commits to the dismod4 repository.
Browse files Browse the repository at this point in the history
Lines with no 'at' characters, are general comments not connected to
a specific file. Lines containing an 'at' character are "file name"
followed by comment. Lines before the first 'at' character are preserved
during
	./commit.sh edit
for example this entire paragraph is preserved.
  • Loading branch information
bradbell committed Oct 16, 2011
1 parent 559e95e commit f050fa5
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 19 deletions.
2 changes: 1 addition & 1 deletion doc.omh
Expand Up @@ -33,7 +33,7 @@ $hiliteseq%
%.%reverse%(% reverse
%$$

$section pycppad-20110323: A Python Algorithm Derivative Package$$
$section pycppad-20111015: A Python Algorithm Derivative Package$$

$index AD, python$$
$index python, AD$$
Expand Down
22 changes: 11 additions & 11 deletions omh/install.omh
Expand Up @@ -53,8 +53,8 @@ $index download, pycppad$$
$index pycppad, download$$
Download the file
$href%
http://www.seanet.com/~bradbell/pycppad-20110323.tar.gz%
pycppad-20110323.tar.gz
http://www.seanet.com/~bradbell/pycppad-20111015.tar.gz%
pycppad-20111015.tar.gz
%$$
and store it on your machine.

Expand All @@ -65,14 +65,14 @@ $index extract, pycppad$$
$index pycppad, extract$$
On unix, you could use the command
$codep
tar -xvzf pycppad-20110323.tar.gz
tar -xvzf pycppad-20111015.tar.gz
$$
which would create the directory $code pycppad-20110323$$.
which would create the directory $code pycppad-20111015$$.

$head Required Setup Information$$
The value of the following setup variables, in the file
$codep
pycppad-20110323/setup.py
pycppad-20111015/setup.py
$$
must be set to agree with your system:
$code
Expand All @@ -89,7 +89,7 @@ $index pycppad, build$$
$subhead With Debugging$$
$index debugging, build$$
$index build, debugging$$
Change into the directory $code pycppad-20110323$$ and execute the command
Change into the directory $code pycppad-20111015$$ and execute the command
$codep
./setup.py build_ext --debug --undef NDEBUG
$$
Expand Down Expand Up @@ -162,7 +162,7 @@ $index test, pycppad$$
$index pycppad, test$$
You can test of all the
$cref/examples/example/$$ in the $code pycppad$$ documentation.
Change into the directory $code pycppad-20110323$$ and execute the command
Change into the directory $code pycppad-20111015$$ and execute the command
$codep
python test_example.py
$$
Expand All @@ -179,7 +179,7 @@ You may or may not preform this step:
$pre

$$
Change into the directory $code pycppad-20110323$$ and execute the command
Change into the directory $code pycppad-20111015$$ and execute the command
$codei%
python setup.py install --prefix=%prefix%
%$$
Expand All @@ -206,7 +206,7 @@ an uninstall command. You can uninstall the $code pycppad$$ package
by removing the entries
$codei%
%prefix%/lib/python%major%.%minor%/site-packages/pycppad
%prefix%/lib/python%major%.%minor%/site-packages/pycppad-20110323.egg-info
%prefix%/lib/python%major%.%minor%/site-packages/pycppad-20111015.egg-info
%prefix%/share/doc/pycppad
%$$
where $icode major$$ and $icode minor$$
Expand All @@ -225,7 +225,7 @@ $codei%
%$$
unless the distribution directory
$codep
pycppad-20110323
pycppad-20111015
$$
is in your python path.
If you have installed $code pycppad$$,
Expand Down Expand Up @@ -257,7 +257,7 @@ to your $code @HOME/.bashrc$$ file.
$head pycppad Documentation$$
The documentation for $code pycppad$$ starts out in the directory
$codep
pycppad-20110323/doc
pycppad-20111015/doc
$$
During the installation process, it is copied to the directory
$codei%
Expand Down
20 changes: 14 additions & 6 deletions pycppad/pycppad.cpp
Expand Up @@ -509,10 +509,14 @@ BOOST_PYTHON_MODULE(cppad_)
.def(str(self))
PYCPPAD_OPERATOR_LIST
PYCPPAD_STD_MATH_LINK_PY(double)
.def( pow(self, self) )
.def( pow(self, double()) )
.def( pow(double(), self) )

// abs
.def( abs(self) )

// pow
.def( pow(self, self) )
.def( pow(self, double()) )
.def( pow(double(), self) )
;

class_<ADFun_double>("adfun_float", init< array& , array& >())
Expand All @@ -528,10 +532,14 @@ BOOST_PYTHON_MODULE(cppad_)
.def(str(self))
PYCPPAD_OPERATOR_LIST
PYCPPAD_STD_MATH_LINK_PY(AD_double)
.def( pow(self, self) )
.def( pow(self, double()) )
.def( pow(double(), self) )

// abs
.def( abs(self) )

// pow
.def( pow(self, self) )
.def( pow(self, double()) )
.def( pow(double(), self) )
;
class_<ADFun_AD_double>("adfun_a_float", init< array& , array& >())
.def("domain", &ADFun_AD_double::Domain)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -24,7 +24,7 @@
# for documentation on how to use the script setup.py
# ---------------------------------------------------------------------
# Values in setup.py that are replaced by build.sh
package_version = '20110323'
package_version = '20111015'
cppad_tarball = 'cppad-20110101.3.gpl.tgz'
cppad_download_dir = 'http://www.coin-or.org/download/source/CppAD'
# ---------------------------------------------------------------------
Expand Down

0 comments on commit f050fa5

Please sign in to comment.