Skip to content

double output from sigjoin and sigcombine #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

double output from sigjoin and sigcombine #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/calcSignature.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,9 +651,10 @@ namespace CalcSignature{
sigBackwards(d, m, lengthOfPath, path, allSigDerivs, output);
}

template<class OutputNumber_>
void sigJoin(int d, int m, const Number* signature,
const Number* displacement, double fixedLast,
OutputNumber* output)
OutputNumber_* output)
{
Signature allSig, segmentSig;
allSig.fromRaw(d, m, signature);
Expand Down Expand Up @@ -691,9 +692,10 @@ namespace CalcSignature{
class SigCombiner{
Signature m_sig1, m_sig2, m_dSig1, m_dSig2;
public:
template<class OutputNumber_>
void sigCombine(int d, int m, const Number* signature1,
const Number* signature2,
OutputNumber* output)
OutputNumber_* output)
{
m_sig1.fromRaw(d, m, signature1);
m_sig2.fromRaw(d, m, signature2);
Expand Down
4 changes: 2 additions & 2 deletions src/pythonsigs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ sigJoin(PyObject *self, PyObject *args){
if(sig.read(a,nPaths*sigLength)||displacement.read(b,nPaths*d_given))
ERR("Out of memory");

using OutT = UseFloat;
using OutT = UseDouble;
PyObject* o = PyArray_SimpleNew(ndims, PyArray_DIMS(a),OutT::typenum);
if(!o)
return nullptr;
Expand Down Expand Up @@ -668,7 +668,7 @@ sigCombine(PyObject *self, PyObject *args){
if(sig1.read(a,nPaths*sigLength)||sig2.read(b,nPaths*sigLength))
ERR("Out of memory");

using OutT = UseFloat;
using OutT = UseDouble;
PyObject* o = PyArray_SimpleNew(ndims, PyArray_DIMS(a),OutT::typenum);
if(!o)
return nullptr;
Expand Down