Skip to content

Commit

Permalink
renamed validateNames to validate
Browse files Browse the repository at this point in the history
  • Loading branch information
neworderofjamie committed Jul 20, 2021
1 parent d3f277b commit d4d4f0f
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion include/genn/genn/currentSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class GENN_EXPORT CurrentSource
{
// Validate names
Utils::validateVarPopName(name, "Current source");
getCurrentSourceModel()->validateNames();
getCurrentSourceModel()->validate();
}

//------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/currentSourceModels.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class GENN_EXPORT Base : public Models::Base
boost::uuids::detail::sha1::digest_type getHashDigest() const;

//! Validate names of parameters etc
using Models::Base::validateNames;
using Models::Base::validate;
};

//----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/customUpdate.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class GENN_EXPORT CustomUpdateBase
// Validate names
Utils::validateVarPopName(name, "Custom update");
Utils::validateVarPopName(updateGroupName, "Custom update group name");
getCustomUpdateModel()->validateNames();
getCustomUpdateModel()->validate();
}

//------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/customUpdateModels.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class GENN_EXPORT Base : public Models::Base
boost::uuids::detail::sha1::digest_type getHashDigest() const;

//! Validate names of parameters etc
void validateNames() const;
void validate() const;
};

//----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/initSparseConnectivitySnippet.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class GENN_EXPORT Base : public Snippet::Base
boost::uuids::detail::sha1::digest_type getHashDigest() const;

//! Validate names of parameters etc
void validateNames() const;
void validate() const;
};

//----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/initVarSnippet.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class GENN_EXPORT Base : public Snippet::Base
boost::uuids::detail::sha1::digest_type getHashDigest() const;

//! Validate names of parameters etc
using Snippet::Base::validateNames;
using Snippet::Base::validate;

//! Does this var init snippet require kernel-based connectivity
bool requiresKernel() const;
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/models.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class GENN_EXPORT Base : public Snippet::Base
void updateHash(boost::uuids::detail::sha1 &hash) const;

//! Validate names of parameters etc
void validateNames() const;
void validate() const;
};


Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/neuronGroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ class GENN_EXPORT NeuronGroup
{
// Validate names
Utils::validateVarPopName(name, "Neuron group");
getNeuronModel()->validateNames();
getNeuronModel()->validate();
}

//------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/neuronModels.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class GENN_EXPORT Base : public Models::Base
boost::uuids::detail::sha1::digest_type getHashDigest() const;

//! Validate names of parameters etc
void validateNames() const;
void validate() const;
};

//----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/postsynapticModels.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class GENN_EXPORT Base : public Models::Base
boost::uuids::detail::sha1::digest_type getHashDigest() const;

//! Validate names of parameters etc
using Models::Base::validateNames;
using Models::Base::validate;
};

//----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions include/genn/genn/snippet.h
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ class GENN_EXPORT Base
}

//! Validate names of parameters etc
void validateNames() const
void validate() const
{
Utils::validateParamNames(getParamNames());
Utils::validateVecNames(getDerivedParams(), "Derived parameter");
Expand Down Expand Up @@ -254,7 +254,7 @@ class Init
: m_Snippet(snippet), m_Params(params)
{
// Validate names
getSnippet()->validateNames();
getSnippet()->validate();
}

//----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/genn/genn/weightUpdateModels.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ class GENN_EXPORT Base : public Models::Base
boost::uuids::detail::sha1::digest_type getHashDigest() const;

//! Validate names of parameters etc
void validateNames() const;
void validate() const;
};

//----------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions src/genn/genn/customUpdateModels.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ boost::uuids::detail::sha1::digest_type CustomUpdateModels::Base::getHashDigest(
return hash.get_digest();
}
//----------------------------------------------------------------------------
void CustomUpdateModels::Base::validateNames() const
void CustomUpdateModels::Base::validate() const
{
// Superclass
Models::Base::validateNames();
Models::Base::validate();

Utils::validateVecNames(getVarRefs(), "Variable reference");
}
4 changes: 2 additions & 2 deletions src/genn/genn/initSparseConnectivitySnippet.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ boost::uuids::detail::sha1::digest_type InitSparseConnectivitySnippet::Base::get
return hash.get_digest();
}
//----------------------------------------------------------------------------
void InitSparseConnectivitySnippet::Base::validateNames() const
void InitSparseConnectivitySnippet::Base::validate() const
{
// Superclass
Snippet::Base::validateNames();
Snippet::Base::validate();
Utils::validateVecNames(getRowBuildStateVars(), "Row building state variable");
Utils::validateVecNames(getColBuildStateVars(), "Column building state variable");
}
6 changes: 3 additions & 3 deletions src/genn/genn/models.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ void Base::updateHash(boost::uuids::detail::sha1 &hash) const
Utils::updateHash(getVars(), hash);
}
//----------------------------------------------------------------------------
void Base::validateNames() const
void Base::validate() const
{
// Superclass
Snippet::Base::validateNames();
Snippet::Base::validate();

Utils::validateVecNames(getVars(), "Variable");
}
Expand Down Expand Up @@ -180,4 +180,4 @@ void Models::updateHash(const WUVarReference &v, boost::uuids::detail::sha1 &has
Utils::updateHash(v.getTransposeTargetName(), hash);
Utils::updateHash(v.getTransposeVarIndex(), hash);
}
}
}
4 changes: 2 additions & 2 deletions src/genn/genn/neuronModels.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ boost::uuids::detail::sha1::digest_type NeuronModels::Base::getHashDigest() cons
return hash.get_digest();
}
//----------------------------------------------------------------------------
void NeuronModels::Base::validateNames() const
void NeuronModels::Base::validate() const
{
// Superclass
Models::Base::validateNames();
Models::Base::validate();

Utils::validateVecNames(getAdditionalInputVars(), "Additional input variable");
}
4 changes: 2 additions & 2 deletions src/genn/genn/synapseGroup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -441,8 +441,8 @@ SynapseGroup::SynapseGroup(const std::string &name, SynapseMatrixType matrixType
{
// Validate names
Utils::validateVarPopName(name, "Synapse group");
getWUModel()->validateNames();
getPSModel()->validateNames();
getWUModel()->validate();
getPSModel()->validate();

// If connectivity is procedural
if(m_MatrixType & SynapseMatrixConnectivity::PROCEDURAL) {
Expand Down
4 changes: 2 additions & 2 deletions src/genn/genn/weightUpdateModels.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ boost::uuids::detail::sha1::digest_type WeightUpdateModels::Base::getHashDigest(
return hash.get_digest();
}
//----------------------------------------------------------------------------
void WeightUpdateModels::Base::validateNames() const
void WeightUpdateModels::Base::validate() const
{
// Superclass
Models::Base::validateNames();
Models::Base::validate();

Utils::validateVecNames(getPreVars(), "Presynaptic variable");
Utils::validateVecNames(getPostVars(), "Presynaptic variable");
Expand Down

0 comments on commit d4d4f0f

Please sign in to comment.