Skip to content

Commit

Permalink
more const refs
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25436 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@rfranke
rfranke committed Apr 7, 2015
1 parent ce0bfaf commit b109d64
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
46 changes: 23 additions & 23 deletions SimulationRuntime/cpp/Include/Core/Math/Array.h
View file
Expand Up @@ -10,7 +10,7 @@ template<class T>class BaseArray
public:
BaseArray(bool is_static)
:_static(is_static)
{};
{}

//interface methods for all arrays

Expand All @@ -22,8 +22,8 @@ template<class T>class BaseArray
virtual const T* getData() const = 0;
virtual unsigned int getNumElems() const = 0;
virtual unsigned int getNumDims() const = 0;
virtual void setDims(std::vector<size_t> v) = 0;
virtual void resize(std::vector<size_t> dims) = 0;
virtual void setDims(const std::vector<size_t>& v) = 0;
virtual void resize(const std::vector<size_t>& dims) = 0;
virtual const char** getCStrData()
{
throw ModelicaSimulationError(MODEL_ARRAY_FUNCTION,"Wrong virtual Array getCStrData call");
Expand Down Expand Up @@ -142,7 +142,7 @@ template<typename T, std::size_t size>class StatArrayDim1 : public BaseArray<T>
return *this;
}

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
std::runtime_error("Cannot resize static array!");
Expand Down Expand Up @@ -212,7 +212,7 @@ template<typename T, std::size_t size>class StatArrayDim1 : public BaseArray<T>
return 1;
}

virtual void setDims(std::vector<size_t> v) { }
virtual void setDims(const std::vector<size_t>& v) { }
void setDims(size_t size1) { }

typedef typename boost::array<T,size>::const_iterator const_iterator;
Expand Down Expand Up @@ -279,7 +279,7 @@ template<std::size_t size>class StatArrayDim1<string,size> : public BaseArray<st
// _array_data = otherArray._array_data;
//}

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
std::runtime_error("Cannot resize static array!");
Expand Down Expand Up @@ -405,7 +405,7 @@ template<std::size_t size>class StatArrayDim1<string,size> : public BaseArray<st
return 1;
}

virtual void setDims(std::vector<size_t> v) { }
virtual void setDims(const std::vector<size_t>& v) { }
void setDims(size_t size1) { }

typedef typename boost::array<string,size>::const_iterator const_iterator;
Expand Down Expand Up @@ -484,7 +484,7 @@ template<typename T ,std::size_t size1,std::size_t size2,bool fotran = false>cla

}

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
std::runtime_error("Cannot resize static array!");
Expand Down Expand Up @@ -562,7 +562,7 @@ template<typename T ,std::size_t size1,std::size_t size2,bool fotran = false>cla
return _array_data.data();
}

virtual void setDims(std::vector<size_t> v) { }
virtual void setDims(const std::vector<size_t>& v) { }
void setDims(size_t i,size_t j) { }
private:
//boost::array< boost::array<T, size2>, size1> _array_data;
Expand Down Expand Up @@ -661,7 +661,7 @@ class StatArrayDim2<string,size1,size2> : public BaseArray<string>
throw ModelicaSimulationError(MODEL_ARRAY_FUNCTION,"append not supported for 2-dim string array");
}

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
std::runtime_error("Cannot resize static array!");
Expand Down Expand Up @@ -748,7 +748,7 @@ class StatArrayDim2<string,size1,size2> : public BaseArray<string>
return _c_array_data.c_array();
}

virtual void setDims(std::vector<size_t> v) { }
virtual void setDims(const std::vector<size_t>& v) { }
void setDims(size_t i,size_t j) { }
private:
//boost::array< boost::array<T, size2>, size1> _array_data;
Expand Down Expand Up @@ -817,7 +817,7 @@ template<typename T ,std::size_t size1, std::size_t size2, std::size_t size3> cl
memcpy( _array_data.begin(), data, size1*size2*size3 * sizeof( T ) );
}

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
std::runtime_error("Cannot resize static array!");
Expand Down Expand Up @@ -864,7 +864,7 @@ template<typename T ,std::size_t size1, std::size_t size2, std::size_t size3> cl
return 3;
}

virtual void setDims(std::vector<size_t> v) { }
virtual void setDims(const std::vector<size_t>& v) { }
void setDims(size_t i,size_t j,size_t k) { }
/*
access to data
Expand Down Expand Up @@ -990,7 +990,7 @@ class StatArrayDim4 : public BaseArray<T>
{
return size1 + size2 + size3 + size4;
}
virtual void setDims(std::vector<size_t> v)
virtual void setDims(const std::vector<size_t>& v)
{
}
Expand Down Expand Up @@ -1115,7 +1115,7 @@ class StatArrayDim5 : public BaseArray<T>
{
return size1 + size2 + size3 + size4 + size5;
}
virtual void setDims(std::vector<size_t> v)
virtual void setDims(const std::vector<size_t>& v)
{
}
Expand Down Expand Up @@ -1188,7 +1188,7 @@ template<typename T>class DynArrayDim1 : public BaseArray<T>
}
*/

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
{
Expand Down Expand Up @@ -1253,7 +1253,7 @@ template<typename T>class DynArrayDim1 : public BaseArray<T>
_multi_array.reindex(1);
}

virtual void setDims(std::vector<size_t> v)
virtual void setDims(const std::vector<size_t>& v)
{
_multi_array.resize(v);
_multi_array.reindex(1);
Expand Down Expand Up @@ -1335,7 +1335,7 @@ template<typename T >class DynArrayDim2 : public BaseArray<T>
}
~DynArrayDim2(){}

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
{
Expand Down Expand Up @@ -1403,7 +1403,7 @@ template<typename T >class DynArrayDim2 : public BaseArray<T>
_multi_array.reindex(1);
}

virtual void setDims(std::vector<size_t> v)
virtual void setDims(const std::vector<size_t>& v)
{
_multi_array.resize(v);
_multi_array.reindex(1);
Expand Down Expand Up @@ -1488,7 +1488,7 @@ template<typename T> class DynArrayDim3 : public BaseArray<T>
}
*/

virtual void resize(std::vector<size_t> dims)
virtual void resize(const std::vector<size_t>& dims)
{
if (dims != getDims())
{
Expand Down Expand Up @@ -1532,7 +1532,7 @@ template<typename T> class DynArrayDim3 : public BaseArray<T>
_multi_array.reindex(1);
}

virtual void setDims(std::vector<size_t> v)
virtual void setDims(const std::vector<size_t>& v)
{
_multi_array.resize(v);
_multi_array.reindex(1);
Expand Down Expand Up @@ -1652,7 +1652,7 @@ template<typename T> class DynArrayDim4 : public BaseArray<T>
_multi_array.reindex(1);
}
virtual void setDims(std::vector<size_t> v)
virtual void setDims(const std::vector<size_t>& v)
{
_multi_array.resize(v);
_multi_array.reindex(1);
Expand Down Expand Up @@ -1758,7 +1758,7 @@ class DynArrayDim5 : public BaseArray<T>
_multi_array.reindex(1);
}
virtual void setDims(std::vector<size_t> v)
virtual void setDims(const std::vector<size_t>& v)
{
_multi_array.resize(v);
_multi_array.reindex(1);
Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/cpp/Include/Core/Math/ArraySlice.h
View file
Expand Up @@ -204,12 +204,12 @@ class ArraySlice : public BaseArray<T> {
return ndims;
}

virtual void setDims(std::vector<size_t> v) {
virtual void setDims(const std::vector<size_t> &v) {
throw ModelicaSimulationError(MODEL_ARRAY_FUNCTION,
"Can't set dims of ArraySlice");
}

virtual void resize(std::vector<size_t> dims) {
virtual void resize(const std::vector<size_t> &dims) {
throw ModelicaSimulationError(MODEL_ARRAY_FUNCTION,
"Can't resize ArraySlice");
}
Expand Down

0 comments on commit b109d64

Please sign in to comment.