aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--misc/optvec.hpp4
-rw-r--r--statistics/chisq.hpp7
2 files changed, 6 insertions, 5 deletions
diff --git a/misc/optvec.hpp b/misc/optvec.hpp
index d950c5f..2e8ecb2 100644
--- a/misc/optvec.hpp
+++ b/misc/optvec.hpp
@@ -13,8 +13,8 @@ namespace opt_utilities
public:
optvec()
{}
-
- optvec(size_t s)
+
+ explicit optvec(size_t s)
:std::vector<T>(s)
{}
diff --git a/statistics/chisq.hpp b/statistics/chisq.hpp
index f9c2c22..339ab6f 100644
--- a/statistics/chisq.hpp
+++ b/statistics/chisq.hpp
@@ -208,9 +208,9 @@ namespace opt_utilities
};
#endif
- template<typename T,typename Tp,typename Ts,typename Tstr>
- class chisq
- :public statistic<optvec<T>,optvec<T>,Tp,Ts,Tstr>
+ template<typename T,typename Ts,typename Tstr>
+ class chisq<optvec<T>,optvec<T>,optvec<T>,Ts,Tstr>
+ :public statistic<optvec<T>,optvec<T>,optvec<T>,Ts,Tstr>
{
private:
bool verb;
@@ -218,6 +218,7 @@ namespace opt_utilities
typedef optvec<T> Tx;
typedef optvec<T> Ty;
+ typedef optvec<T> Tp;
statistic<Ty,Tx,Tp,Ts,Tstr>* do_clone()const
{
// return const_cast<statistic<Ty,Tx,Tp>*>(this);