Commit 1524e243 authored by Thomas Schiex's avatar Thomas Schiex
Browse files

[code] minor typos and merge from cpd branch.

parent 6a9362de
......@@ -89,7 +89,7 @@ SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp03
Standard: Cpp11
TabWidth: 8
UseTab: Never
...
......
// Cmake generated version
#define Toulbar_VERSION "1.0.0-68-g5b8782d-master (1542708259)"
#define Toulbar_VERSION "1.0.0-69-g938b314-master-tainted (1542795076)"
......@@ -17,7 +17,7 @@
Long AbstractNaryConstraint::getDomainInitSizeProduct()
{
if (arity_ == 0)
return 0;
return 1;
Long cartesianProduct = 1;
for (int i = 0; i < arity_; i++) {
// trap overflow numbers
......
......@@ -32,7 +32,7 @@ void AllDiffConstraint::buildIndex()
void AllDiffConstraint::read(istream& file, bool mult)
{
// Only two pararmeters for control :
// Only two parameters for control :
// 1) the cost measure : "var" = mu_var ; "dec" = mu_dec
string str;
......
......@@ -1721,7 +1721,6 @@ int _tmain(int argc, TCHAR* argv[])
}
}
// Z: debug mode (save problem at each node if verbosity option set!)
// for (int j=0; argv[i][j] != 0; j++) if (argv[i][j]=='Z') ToulBar2::debug++;
if (args.OptionId() == OPT_debug) {
......
......@@ -89,6 +89,7 @@ inline double Pow(double x, double y)
inline double Exp10(double x) { return exp10(x); }
inline double Exp(double x) { return exp(x); }
inline double Log10(double x) { return log10(x); }
inline double Expm1(double x) { return expm1(x); }
inline double Log(double x) { return log(x); }
inline double Log1p(double x) { return log1p(x); }
#endif
......@@ -102,6 +103,7 @@ inline double Exp(double x) { return exp(x); }
inline double Log10(double x) { return log(x) / log(10.); }
inline double Log(double x) { return log(x); }
inline double Log1p(double x) { return log(1. + x); }
inline double Expm1(double x) { return exp(x) - 1.; }
#endif
#endif
......@@ -114,6 +116,7 @@ inline Double Pow(Double x, Double y)
inline Double Exp10(Double x) { return powl(10.l, (Double)x); }
inline Double Exp(Double x) { return expl(x); }
inline Double Log10(Double x) { return log10l(x); }
inline Double Expm1(Double x) { return expm1l(x); }
inline Double Log(Double x) { return logl(x); }
inline Double Log1p(Double x) { return log1pl(x); }
#endif
......@@ -126,6 +129,7 @@ inline Double Exp10(Double x) { return pow(10., x); }
inline Double Log10(Double x) { return log(x) / log(10.); }
inline Double Log(Double x) { return log(x); }
inline Double Log1p(Double x) { return log(1. + x); }
inline Double Expm1(Double x) { return exp(x) - 1.; }
#endif
#endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment