Use more often uint64_t instead of uint32_t to better conform to XML

SWIG port RepresentationSetRepresentation::pushBack(RESQML2_NS::AbstractRepresentation* rep)

Author: philippeVerney

example/example.cpp

@@ -2871,8 +2871,8 @@ void deserializeStratiColumn(RESQML2_NS::StratigraphicColumn * stratiColumn, con
 			cout << "This is a chrono rank!" << endl;
 		else
 			cout << "This is not a chrono rank!" << endl;
-		unsigned int contactCount = stratiColumnRankInterp->getContactCount();
-		for (unsigned int contactIndex = 0; contactIndex < contactCount; ++contactIndex) {
+		uint64_t contactCount = stratiColumnRankInterp->getContactCount();
+		for (uint64_t contactIndex = 0; contactIndex < contactCount; ++contactIndex) {
 			cout << "SUBJECT : " << endl;
 			showAllMetadata(stratiColumnRankInterp->getSubjectOfContact(contactIndex));
 			cout << "DIRECT OBJECT : " << endl;
@@ -3232,8 +3232,8 @@ void deserializeTimeSeriesData(COMMON_NS::DataObjectRepository & repo)
 void deserializeGridHyperslabbingInterfaceSequence(const COMMON_NS::DataObjectRepository & repo)
 {
 	cout << endl << "BEGIN: IJK GRID REP (hyperslabbing)" << std::endl;
-	unsigned int ijkGridCount = repo.getIjkGridRepresentationCount();
-	for (unsigned int ijkGridIdx = 0; ijkGridIdx < ijkGridCount; ++ijkGridIdx)
+	uint64_t ijkGridCount = repo.getIjkGridRepresentationCount();
+	for (uint64_t ijkGridIdx = 0; ijkGridIdx < ijkGridCount; ++ijkGridIdx)
 	{
 		RESQML2_NS::AbstractIjkGridRepresentation* ijkGrid = repo.getIjkGridRepresentation(ijkGridIdx);
 
@@ -4902,8 +4902,8 @@ void deserializeGridConnectionSetRepresentation(RESQML2_NS::AbstractIjkGridRepre
 void deserializeIjkGrid(const COMMON_NS::DataObjectRepository & repo)
 {
 	std::cout << endl << "IJK GRID REP" << endl;
-	unsigned int ijkGridCount = repo.getIjkGridRepresentationCount();
-	for (unsigned int ijkGridIdx = 0; ijkGridIdx < ijkGridCount; ++ijkGridIdx)
+	uint64_t ijkGridCount = repo.getIjkGridRepresentationCount();
+	for (uint64_t ijkGridIdx = 0; ijkGridIdx < ijkGridCount; ++ijkGridIdx)
 	{
 		RESQML2_NS::AbstractIjkGridRepresentation* ijkGrid = repo.getIjkGridRepresentation(ijkGridIdx);
 
@@ -5232,9 +5232,9 @@ void deserialize(const string & inputFile)
 		repo.clearWarnings();
 	}
 
-	const unsigned int hdfProxyCount = repo.getHdfProxyCount();
+	const uint64_t hdfProxyCount = repo.getHdfProxyCount();
 	cout << "There are " << hdfProxyCount << " hdf files associated to this epc document." << endl;
-	for (unsigned int hdfProxyIndex = 0; hdfProxyIndex < hdfProxyCount; ++hdfProxyIndex) {
+	for (uint64_t hdfProxyIndex = 0; hdfProxyIndex < hdfProxyCount; ++hdfProxyIndex) {
 		cout << "Hdf file relative path : " << repo.getHdfProxy(hdfProxyIndex)->getRelativePath() << endl;
 	}
 	for (size_t warningIndex = 0; warningIndex < repo.getWarnings().size(); ++warningIndex) {

src/common/DataObjectRepository.h

@@ -558,15 +558,11 @@ namespace COMMON_NS
 		*/
 #define GETTER_DATAOBJECTS(returnedDataType, dataObjectName)\
 		DLL_IMPORT_OR_EXPORT std::vector<returnedDataType*> get##dataObjectName##Set() const;\
-		DLL_IMPORT_OR_EXPORT unsigned int get##dataObjectName##Count() const {\
-			const size_t result = get##dataObjectName##Set().size();\
-			if (result > (std::numeric_limits<unsigned int>::max)()) { throw std::range_error("The count is superior to unsigned int max"); }\
-			return static_cast<unsigned int>(result);\
+		DLL_IMPORT_OR_EXPORT uint64_t get##dataObjectName##Count() const {\
+			return get##dataObjectName##Set().size();\
 		}\
-		DLL_IMPORT_OR_EXPORT returnedDataType* get##dataObjectName(unsigned int index) const {\
-			std::vector<returnedDataType*> all = get##dataObjectName##Set();\
-			if (index >= all.size()) { throw std::out_of_range("The index is out of range"); }\
-			return all[index];\
+		DLL_IMPORT_OR_EXPORT returnedDataType* get##dataObjectName(uint64_t index) const {\
+			return get##dataObjectName##Set().at(index);\
 		}
 
 		GETTER_DATAOBJECTS(EML2_NS::AbstractHdfProxy, HdfProxy)

src/eml2_3/Activity.cpp

@@ -53,11 +53,9 @@ void Activity::pushBackParameter(const std::string& title, double value, gsoap_r
 		if (maxOccurs > -1 && static_cast<uint64_t>(maxOccurs) <= getParameterCount(title)) {
 			throw invalid_argument("The max number of occurrences has already been reached for parameter " + title);
 		}
-		if (dynamic_cast<EML2_NS::ActivityTemplate*>(activityTemplate) != nullptr) {
-			vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = static_cast<EML2_NS::ActivityTemplate*>(activityTemplate)->getParameterAllowedKinds(title);
-			if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::floatingPoint) == allowedKinds.end())
-				throw invalid_argument("The parameter template " + title + " does not allow a double datatype.");
-		}
+		vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = activityTemplate->getParameterAllowedKinds(title);
+		if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::floatingPoint) == allowedKinds.end())
+			throw invalid_argument("The parameter template " + title + " does not allow a double datatype.");
 	}
 
 	_eml23__Activity* activity = static_cast<_eml23__Activity*>(gsoapProxy2_3);
@@ -80,11 +78,9 @@ void Activity::pushBackParameter(const std::string& title, const std::string & v
 		if (maxOccurs > -1 && static_cast<uint64_t>(maxOccurs) <= getParameterCount(title)) {
 			throw invalid_argument("The max number of occurrences has already been reached for parameter " + title);
 		}
-		if (dynamic_cast<EML2_NS::ActivityTemplate*>(activityTemplate) != nullptr) {
-			vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = static_cast<EML2_NS::ActivityTemplate*>(activityTemplate)->getParameterAllowedKinds(title);
-			if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::string) == allowedKinds.end())
-				throw invalid_argument("The parameter template " + title + " does not allow a string datatype.");
-		}
+		vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = activityTemplate->getParameterAllowedKinds(title);
+		if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::string) == allowedKinds.end())
+			throw invalid_argument("The parameter template " + title + " does not allow a string datatype.");
 	}
 
 	_eml23__Activity* activity = static_cast<_eml23__Activity*>(gsoapProxy2_3);
@@ -106,11 +102,9 @@ void Activity::pushBackParameter(const std::string& title, int64_t value)
 		if (maxOccurs > -1 && static_cast<uint64_t>(maxOccurs) <= getParameterCount(title)) {
 			throw invalid_argument("The max number of occurrences has already been reached for parameter " + title);
 		}
-		if (dynamic_cast<EML2_NS::ActivityTemplate*>(activityTemplate) != nullptr) {
-			vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = static_cast<EML2_NS::ActivityTemplate*>(activityTemplate)->getParameterAllowedKinds(title);
-			if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::integer) == allowedKinds.end())
-				throw invalid_argument("The parameter template " + title + " does not allow an integer datatype.");
-		}
+		vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = activityTemplate->getParameterAllowedKinds(title);
+		if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::integer) == allowedKinds.end())
+			throw invalid_argument("The parameter template " + title + " does not allow an integer datatype.");
 	}
 
 	_eml23__Activity* activity = static_cast<_eml23__Activity*>(gsoapProxy2_3);
@@ -134,11 +128,9 @@ void Activity::pushBackParameter(const std::string& title, AbstractObject* resqm
 		int64_t maxOccurs = activityTemplate->getParameterMaxOccurences(title);
 		if (maxOccurs > -1 && static_cast<uint64_t>(maxOccurs) <= getParameterCount(title))
 			throw invalid_argument("The max number of occurrences has already been reached for parameter " + title);
-		if (dynamic_cast<EML2_NS::ActivityTemplate*>(activityTemplate) != nullptr) {
-			vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = static_cast<EML2_NS::ActivityTemplate*>(activityTemplate)->getParameterAllowedKinds(title);
-			if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::dataObject) == allowedKinds.end())
-				throw invalid_argument("The parameter template " + title + " does not allow a data object datatype.");
-		}
+		vector<gsoap_resqml2_0_1::resqml20__ParameterKind> allowedKinds = activityTemplate->getParameterAllowedKinds(title);
+		if (allowedKinds.size() > 0 && find(allowedKinds.begin(), allowedKinds.end(), gsoap_resqml2_0_1::resqml20__ParameterKind::dataObject) == allowedKinds.end())
+			throw invalid_argument("The parameter template " + title + " does not allow a data object datatype.");
 	}
 
 	getRepository()->addRelationship(this, resqmlObject);
@@ -260,7 +252,7 @@ vector<gsoap_resqml2_0_1::resqml20__ResqmlUom> Activity::getFloatingPointQuantit
 		throw range_error("The parameter " + paramTitle + " is not in the parameter range.");
 
 	vector<gsoap_resqml2_0_1::resqml20__ResqmlUom> result;
-	for (unsigned int i = 0; i < param.size(); ++i)
+	for (size_t i = 0; i < param.size(); ++i)
 	{
 		if (param[i]->soap_type() != SOAP_TYPE_gsoap_eml2_3_eml23__DoubleQuantityParameter)
 			throw invalid_argument("The parameter " + paramTitle + " contains some non double values.");
@@ -373,8 +365,9 @@ vector<string> Activity::getStringParameterValue(const std::string & paramTitle)
 {
 	vector<gsoap_eml2_3::eml23__AbstractActivityParameter*> param = getParameterFromTitle(paramTitle);
 
-	if (param.size() < 1)
-		invalid_argument("There exists no " + paramTitle + " parameter in this activity.");
+	if (param.size() < 1) {
+		throw invalid_argument("There exists no " + paramTitle + " parameter in this activity.");
+	}
 
 	vector<string> result;
 	for (size_t i = 0; i < param.size(); ++i)
@@ -412,7 +405,7 @@ bool Activity::isAResqmlObjectParameter(const std::string & paramTitle) const
 		throw invalid_argument("There exists no " + paramTitle + " parameter in this activity.");
 	}
 
-	for (unsigned int i = 0; i < param.size(); ++i) {
+	for (size_t i = 0; i < param.size(); ++i) {
 		if (param[i]->soap_type() != SOAP_TYPE_gsoap_eml2_3_eml23__DataObjectParameter)
 			return false;
 	}
@@ -422,17 +415,16 @@ bool Activity::isAResqmlObjectParameter(const std::string & paramTitle) const
 
 bool Activity::isAResqmlObjectParameter(uint64_t index) const
 {
-	_eml23__Activity* activity = static_cast<_eml23__Activity*>(gsoapProxy2_3);
-
-	return activity->Parameter.at(index)->soap_type() == SOAP_TYPE_gsoap_eml2_3_eml23__DataObjectParameter;
+	return static_cast<_eml23__Activity*>(gsoapProxy2_3)->Parameter.at(index)->soap_type() == SOAP_TYPE_gsoap_eml2_3_eml23__DataObjectParameter;
 }
 
 vector<COMMON_NS::AbstractObject*> Activity::getResqmlObjectParameterValue(const std::string & paramTitle) const
 {
 	vector<gsoap_eml2_3::eml23__AbstractActivityParameter*> param = getParameterFromTitle(paramTitle);
 
-	if (param.size() < 1)
-		invalid_argument("There exists no " + paramTitle + " parameter in this activity.");
+	if (param.size() < 1) {
+		throw invalid_argument("There exists no " + paramTitle + " parameter in this activity.");
+	}
 
 	vector<COMMON_NS::AbstractObject*> result;
 	for (size_t i = 0; i < param.size(); ++i)

src/eml2_3/ActivityTemplate.cpp

@@ -37,7 +37,7 @@ void ActivityTemplate::pushBackParameter(const std::string & title,
 	uint64_t minOccurs, int64_t maxOccurs)
 {
 	// Preconditions
-	if (maxOccurs >= 0 && minOccurs > static_cast<unsigned int>(maxOccurs)) {
+	if (maxOccurs >= 0 && minOccurs > static_cast<uint64_t>(maxOccurs)) {
 		throw invalid_argument("Maximum occurences of a parameter template must be at least equal to the minimum occurences of this same parameter template.");
 	}
 

src/epc/FileCoreProperties.cpp

@@ -91,7 +91,7 @@ std::string FileCoreProperties::toString() const
 	oss << "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" << endl;
 
 	// content
-	for (unsigned int i = 0; i < CoreProperty::undefinedCoreProperty; ++i) {
+	for (size_t i = 0; i < CoreProperty::undefinedCoreProperty; ++i) {
 		if (!properties[i].isEmpty()) {
 			oss << "\t" << properties[i].toString() << endl;
 		}
@@ -185,7 +185,7 @@ void FileCoreProperties::setVersion(const std::string & value)
 
 void FileCoreProperties::readFromString(const string & textInput)
 {
-	for (unsigned int i = 0; i < CoreProperty::undefinedCoreProperty; ++i) {
+	for (size_t i = 0; i < CoreProperty::undefinedCoreProperty; ++i) {
 		properties[i].setTypeProperty(CoreProperty::undefinedCoreProperty);
 	}
 

src/resqml2/AbstractIjkGridRepresentation.cpp

@@ -1014,14 +1014,10 @@ uint64_t AbstractIjkGridRepresentation::getFaceCount() const
 
 bool AbstractIjkGridRepresentation::isColumnEdgeSplitted(unsigned int iColumn, unsigned int jColumn, unsigned int edge) const
 {
-	if (!splitInformation)
-		throw invalid_argument("The split information must have been loaded first.");
-	if (iColumn > getICellCount())
-		throw out_of_range("I column is out of range.");
-	if (jColumn > getJCellCount())
-		throw out_of_range("J column is out of range.");
-	if (edge > 3)
-		throw out_of_range("Edge is out of range.");
+	if (!splitInformation) throw invalid_argument("The split information must have been loaded first.");
+	if (iColumn > getICellCount()) throw out_of_range("I column is out of range.");
+	if (jColumn > getJCellCount()) throw out_of_range("J column is out of range.");
+	if (edge > 3) throw out_of_range("Edge is out of range.");
 
 	// Pillar
 	unsigned int iPillarIndex = iColumn;
@@ -1032,24 +1028,31 @@ bool AbstractIjkGridRepresentation::isColumnEdgeSplitted(unsigned int iColumn, u
 		++jPillarIndex;
 
 	// Other column identification
-	int iOtherColum = iColumn;
-	int jOtherColum = jColumn;
-					
-	if (edge == 0) --jOtherColum;
-	else if (edge == 1) ++iOtherColum;
-	else if (edge == 2) ++jOtherColum;
-	else if (edge == 3) --iOtherColum;
-
-	if (iOtherColum < 0 || jOtherColum < 0 || static_cast<unsigned int>(iOtherColum) >= getICellCount() || static_cast<unsigned int>(jOtherColum) >= getJCellCount()) {
-		return false;
+	unsigned int iOtherColum = iColumn;
+	unsigned int jOtherColum = jColumn;					
+	if (edge == 0) {
+		if (jOtherColum == 0) return false;
+		--jOtherColum;
+	}
+	else if (edge == 1) {
+		if (iOtherColum == getICellCount()) return false;
+		++iOtherColum;
+	}
+	else if (edge == 2) {
+		if (jOtherColum == getJCellCount()) return false;
+		++jOtherColum;
+	}
+	else if (edge == 3) {
+		if (iOtherColum == 0) return false;
+		--iOtherColum;
 	}
-	unsigned int otherColumnIndex = getGlobalIndexColumnFromIjIndex(iOtherColum, jOtherColum);
+	const unsigned int otherColumnIndex = getGlobalIndexColumnFromIjIndex(iOtherColum, jOtherColum);
 
 	// Check split on first pillar of the column edge
 	bool result = false;
 	unsigned int pillarIndex = getGlobalIndexPillarFromIjIndex(iPillarIndex, jPillarIndex);
 	if (!splitInformation[pillarIndex].empty()) {
-		unsigned int columnIndex = getGlobalIndexColumnFromIjIndex(iColumn, jColumn);
+		const unsigned int columnIndex = getGlobalIndexColumnFromIjIndex(iColumn, jColumn);
 		for (size_t columnSet = 0; columnSet < splitInformation[pillarIndex].size(); ++columnSet) {
 			for (size_t column = 0; column < splitInformation[pillarIndex][columnSet].second.size(); ++column) {
 				if (splitInformation[pillarIndex][columnSet].second[column] == columnIndex) {
@@ -1094,7 +1097,7 @@ bool AbstractIjkGridRepresentation::isColumnEdgeSplitted(unsigned int iColumn, u
 
 	pillarIndex = getGlobalIndexPillarFromIjIndex(iPillarIndex, jPillarIndex);
 	if (!splitInformation[pillarIndex].empty()) {
-		unsigned int columnIndex = getGlobalIndexColumnFromIjIndex(iColumn, jColumn);
+		const unsigned int columnIndex = getGlobalIndexColumnFromIjIndex(iColumn, jColumn);
 		for (size_t columnSet = 0; columnSet < splitInformation[pillarIndex].size(); ++columnSet) {
 			for (size_t column = 0; column < splitInformation[pillarIndex][columnSet].second.size(); ++column) {
 				if (splitInformation[pillarIndex][columnSet].second[column] == columnIndex) {

src/resqml2/AbstractSeismicLineFeature.cpp

@@ -77,7 +77,7 @@ std::vector<std::string> AbstractSeismicLineFeature::getTraceLabels() const
 	if (gsoapProxy2_0_1 != nullptr) {
 		gsoap_resqml2_0_1::_resqml20__SeismicLineFeature* seismicLine = static_cast<gsoap_resqml2_0_1::_resqml20__SeismicLineFeature*>(gsoapProxy2_0_1);
 		const uint64_t traceCount = seismicLine->TraceCount;
-		if (traceCount > (std::numeric_limits<int64_t>::max)()) {
+		if (traceCount > static_cast<uint64_t>((std::numeric_limits<int64_t>::max)())) {
 			throw overflow_error("The trace count cannot be superior to int64 max");
 		}
 		for (int64_t incr = 0; incr < static_cast<int64_t>(traceCount); ++incr) {

src/resqml2/AbstractStratigraphicOrganizationInterpretation.cpp

@@ -27,36 +27,14 @@ under the License.
 using namespace RESQML2_NS;
 using namespace std;
 
-std::vector<AbstractGridRepresentation *> AbstractStratigraphicOrganizationInterpretation::getGridRepresentations() const
+std::vector<AbstractGridRepresentation*> AbstractStratigraphicOrganizationInterpretation::getGridRepresentationSet() const
 {
 	return getRepository()->getSourceObjects<AbstractGridRepresentation>(this);
 }
 
-unsigned int AbstractStratigraphicOrganizationInterpretation::getGridRepresentationCount() const
-{
-	const size_t count = getGridRepresentations().size();
-
-	if (count > (std::numeric_limits<unsigned int>::max)()) {
-		throw range_error("Too much associated grids");
-	}
-
-	return static_cast<unsigned int>(count);
-}
-
-AbstractGridRepresentation * AbstractStratigraphicOrganizationInterpretation::getGridRepresentation(unsigned int index) const
-{
-	const std::vector<AbstractGridRepresentation *>& gridRepresentationSet = getGridRepresentations();
-
-	if (index >= gridRepresentationSet.size()) {
-		throw out_of_range("The index of the grid representation to get is out of range.");
-	}
-
-	return gridRepresentationSet[index];
-}
-
 bool AbstractStratigraphicOrganizationInterpretation::isAssociatedToGridRepresentation(AbstractGridRepresentation* gridRep) const
 {
-	const std::vector<AbstractGridRepresentation *>& gridRepresentationSet = getGridRepresentations();
+	const std::vector<AbstractGridRepresentation*> gridRepresentationSet = getGridRepresentationSet();
 
 	return find(gridRepresentationSet.begin(), gridRepresentationSet.end(), gridRep) != gridRepresentationSet.end();
 }

src/resqml2/AbstractStratigraphicOrganizationInterpretation.h

@@ -42,37 +42,7 @@ namespace RESQML2_NS
 
 		bool isStratigraphic() const final { return true; }
 
-		/**
-		 * Gets the grid representations associated to this stratigraphic organization interpretation.
-		 *
-		 * @returns	A vector of pointers to all the grid representations associated to this stratigraphic
-		 * 			organization interpretation.
-		 */
-		DLL_IMPORT_OR_EXPORT std::vector<AbstractGridRepresentation*> getGridRepresentations() const;
-
-		/**
-		 * Gets the count of grid representations associated to this stratigraphic organization
-		 * interpretation.
-		 *
-		 * @exception	std::range_error	If the count of associated grid representations is strictly
-		 * 									greater than <tt>unsigned int</tt> max.
-		 *
-		 * @returns	The count of associated grid representations.
-		 */
-		DLL_IMPORT_OR_EXPORT unsigned int getGridRepresentationCount() const;
-
-		/**
-		 * Gets a grid representation associated to this stratigraphic organization interpretation by
-		 * means of its index.
-		 *
-		 * @exception	std::out_of_range	If @p index is out of range.
-		 *
-		 * @param 	index	The index of the grid representation to get in the array of grid
-		 * 					representations of this stratigraphic organization interpretations.
-		 *
-		 * @returns	The associated grid representation at index @p index.
-		 */
-		DLL_IMPORT_OR_EXPORT AbstractGridRepresentation * getGridRepresentation(unsigned int index) const;
+		GETTER_DATAOBJECTS(AbstractGridRepresentation, GridRepresentation)
 
 		/**
 		 * Checks whether a given grid representation is associated to this stratigraphic organization