comparison data/model/SparseValueModel.h @ 606:1415e35881f6

* Some (incomplete) Solaris build bobs
author Chris Cannam
date Thu, 10 Sep 2009 14:17:59 +0000
parents 700cd3350391
children 59e7fe1b1003
comparison
equal deleted inserted replaced
605:133418f4e74c 606:1415e35881f6
17 #define _SPARSE_VALUE_MODEL_H_ 17 #define _SPARSE_VALUE_MODEL_H_
18 18
19 #include "SparseModel.h" 19 #include "SparseModel.h"
20 #include "base/UnitDatabase.h" 20 #include "base/UnitDatabase.h"
21 21
22 #include <cmath> 22 #include "system/System.h"
23 23
24 /** 24 /**
25 * Model containing sparse data (points with some properties) of which 25 * Model containing sparse data (points with some properties) of which
26 * one of the properties is an arbitrary float value. The other 26 * one of the properties is an arbitrary float value. The other
27 * properties depend on the point type. 27 * properties depend on the point type.
66 66
67 virtual void addPoint(const PointType &point) 67 virtual void addPoint(const PointType &point)
68 { 68 {
69 bool allChange = false; 69 bool allChange = false;
70 70
71 if (!std::isnan(point.value) && !std::isinf(point.value)) { 71 if (!ISNAN(point.value) && !ISINF(point.value)) {
72 if (!m_haveExtents || point.value < m_valueMinimum) { 72 if (!m_haveExtents || point.value < m_valueMinimum) {
73 m_valueMinimum = point.value; allChange = true; 73 m_valueMinimum = point.value; allChange = true;
74 // std::cerr << "addPoint: value min = " << m_valueMinimum << std::endl; 74 // std::cerr << "addPoint: value min = " << m_valueMinimum << std::endl;
75 } 75 }
76 if (!m_haveExtents || point.value > m_valueMaximum) { 76 if (!m_haveExtents || point.value > m_valueMaximum) {