From 594f979350b072137c6a85240679b3064bf2d547 Mon Sep 17 00:00:00 2001 From: joao Date: Thu, 9 Jan 2014 19:09:52 +0000 Subject: [PATCH] some fixes associated with the CppAD version --- test/cppadcg/operations/cond_exp.hpp | 8 ++++---- test/cppadcg/operations/div.hpp | 4 ++-- test/cppadcg/operations/mul.hpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/cppadcg/operations/cond_exp.hpp b/test/cppadcg/operations/cond_exp.hpp index dcde4011..2943cbcb 100644 --- a/test/cppadcg/operations/cond_exp.hpp +++ b/test/cppadcg/operations/cond_exp.hpp @@ -25,7 +25,7 @@ CppAD::ADFun* CondExp_pvvvFunc(const std::vector >& X) { assert(X.size() == 3); // parameter value - AD one = 1.; + AD one = T(1.); // dependent variable vector std::vector< AD > Y(5); @@ -49,7 +49,7 @@ CppAD::ADFun* CondExp_vpvvFunc(const std::vector >& X) { assert(X.size() == 3); // parameter value - AD one = 1.; + AD one = T(1.); // dependent variable vector std::vector< AD > Y(5); @@ -73,7 +73,7 @@ CppAD::ADFun* CondExp_vvpvFunc(const std::vector >& X) { assert(X.size() == 3); // parameter value - AD three = 3.; + AD three = T(3.); // dependent variable vector std::vector< AD > Y(5); @@ -97,7 +97,7 @@ CppAD::ADFun* CondExp_vvvpFunc(const std::vector >& X) { assert(X.size() == 3); // parameter value - AD three = 3.; + AD three = T(3.); // dependent variable vector std::vector< AD > Y(5); diff --git a/test/cppadcg/operations/div.hpp b/test/cppadcg/operations/div.hpp index 3806529b..93f344d8 100644 --- a/test/cppadcg/operations/div.hpp +++ b/test/cppadcg/operations/div.hpp @@ -26,8 +26,8 @@ CppAD::ADFun* DivTestOneFunc(const std::vector >& U) { size_t t = 1; // assign some parameters - AD zero = 0.; - AD one = 1.; + AD zero = T(0.); + AD one = T(1.); // dependent variable vector and indices std::vector< AD > Z(6); diff --git a/test/cppadcg/operations/mul.hpp b/test/cppadcg/operations/mul.hpp index 224074af..4fe186f5 100644 --- a/test/cppadcg/operations/mul.hpp +++ b/test/cppadcg/operations/mul.hpp @@ -28,8 +28,8 @@ CppAD::ADFun* MulTestOneFunc(const std::vector >& U) { size_t t = 1; // assign some parameters - AD zero = 0.; - AD one = 1.; + AD zero = T(0.); + AD one = T(1.); // dependent variable vector and indices std::vector< AD > Z(5);