songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- some further warning fixes

This commit is contained in:
Bernd Gärtner 2007-02-23 09:08:12 +00:00
parent 34dd0eae83
commit f3d98caccb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QP_solver/examples/QP_solver/solve_convex_hull_containment_lp2.h
View File

@ -34,6 +34,6 @@ solve_convex_hull_containment_lp (const Point_d& p,
B_it (p.homogeneous_begin()), // b
CGAL::Const_oneset_iterator<CGAL::Comparison_result>(CGAL::EQUAL), // ~
CGAL::Const_oneset_iterator
<typename CGAL::Kernel_traits<Point_d>::Kernel::RT> (0)), ET(0)); // c
<typename CGAL::Kernel_traits<Point_d>::Kernel::RT> (0)), dummy); // c
}

6
QP_solver/include/CGAL/QP_solver/QP_solver_validity_impl.h
View File

@ -561,9 +561,9 @@ is_solution_optimal() const
ET(lower_bound(col) * d) == x[col];
const bool upper_tight = has_finite_upper_bound(col) &&
ET(upper_bound(col) * d) == x[col];
if ( lower_tight && !upper_tight && tau[col] <et0 ||
!lower_tight && !upper_tight && tau[col]!=et0 ||
!lower_tight && upper_tight && tau[col] >et0)
if ( (lower_tight && !upper_tight && tau[col] <et0) ||
(!lower_tight && !upper_tight && tau[col]!=et0) ||
(!lower_tight && upper_tight && tau[col] >et0))
return false;
}

2
QP_solver/test/QP_solver/test_solver.cpp
View File

@ -367,7 +367,7 @@ bool process(const std::string& filename,
type = Double_type;
number_type = "double";
}
if ((type==Double_type && (is_int(IT())) || is_rational(IT())) ||
if ((type==Double_type && (is_int(IT()) || is_rational(IT()))) ||
(type==Int_type && is_rational(IT())) ||
(type==Rational_type && (is_double(IT()) || is_int(IT()))))
return true;