[med-svn] [libfreecontact-perl] 10/46: Imported Upstream version 0.01

[Laszlo Kajan]

This is an automated email from the git hooks/post-receive script.

lkajan pushed a commit to branch master
in repository libfreecontact-perl.

commit 8a5bcb66226724a64b2ee62d21825e3cef8267f1
Author: Laszlo Kajan <lkajan at debian.org>
Date:   Fri May 10 19:14:11 2013 +0200

    Imported Upstream version 0.01
---
 FreeContact.xsp    |    2 +-
 lib/FreeContact.pm |    2 +-
 t/02test.t         |    4 ++--
 typemap            |    1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/FreeContact.xsp b/FreeContact.xsp
index e67e1ff..b8294b8 100644
--- a/FreeContact.xsp
+++ b/FreeContact.xsp
@@ -56,7 +56,7 @@ predictor::_run( __ali, __cp, __spar, __gapth, __mincontsep, __pseudocnt, __pscn
     time_res_t timing;
   CODE:
     try {
-      if(__timing) __timing = &timing;
+      if(items>=16 && SvROK(ST(15)) && SvTYPE(SvRV(ST(15))) == SVt_PVHV) __timing = &timing;
       RETVAL = THIS->run( __ali, __cp, __spar, __gapth, __mincontsep, __pseudocnt, __pscnt_weight, __estimate_ivcov, __shrink_lambda, __cov20, __gap_incovm, __vecw, __rho, __num_threads, __timing );
     }
     catch (std::exception& e) {
diff --git a/lib/FreeContact.pm b/lib/FreeContact.pm
index 2279b2f..e957a68 100644
--- a/lib/FreeContact.pm
+++ b/lib/FreeContact.pm
@@ -49,7 +49,7 @@ sub                 FreeContact::Predictor::run
         $args{clustpc}, $args{sparsity}, $args{gapth}, $args{mincontsep},
         $args{pseudocnt}, $args{pscnt_weight}, $args{estimate_ivcov}, $args{shrink_lambda},
         $args{cov20}, $args{gap_incovm}, $args{veczw}, $args{rho},
-        $args{num_threads}, $args{timing}
+        $args{num_threads} || 0, $args{timing}
     );
 }
 
diff --git a/t/02test.t b/t/02test.t
index 666362c..c69fba4 100644
--- a/t/02test.t
+++ b/t/02test.t
@@ -13,10 +13,9 @@ sub check_obj {
 }
 
 {
-    my %test_parset = FreeContact::get_ps_evfold();
     my $o = FreeContact::Predictor->new(1); check_obj($o);
     eval {
-        my $res = $o->run(undef, %test_parset);
+        my $res = $o->run(undef);
     };
     like($@, qr/^Odd number of arguments/);
 }
@@ -26,6 +25,7 @@ sub check_obj {
     my @aln = <EXAMPLE>; chomp(@aln);
     close(EXAMPLE);
 
+    my %test_parset = FreeContact::get_ps_evfold();
     my $num_threads = 1; # test will not work with 0
     my $timing = {};
 
diff --git a/typemap b/typemap
index 45fbb89..a0cef51 100644
--- a/typemap
+++ b/typemap
@@ -51,7 +51,6 @@ T_ALI
 		else croak(\"${Package}::$func_name() -- $var is not an AV reference\");
 	}
 T_TIME_RES_PTR
-	$var = (time_res_t*)~NULL;
 
 OUTPUT
 T_CONT_RES

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/libfreecontact-perl.git