Commit 4262cdc3 authored by Jussi Lindgren's avatar Jussi Lindgren

Everything: Reduced C11 dependencies

parent 9fd71ad0
......@@ -7,6 +7,11 @@
SET(foundIncludeDir 1) # true, if all required headers have been found
SET(required_libs_found 1) # true, if all libs which have headers have been found
IF(MSVC90)
MESSAGE(STATUS "CoAdapt P300 requires at least VS 2010\n")
RETURN()
ENDIF(MSVC90)
#GL is natively installed on our Linux pc's and comes with the installation of visual studio. In that case however, one has to make sure the SDK is in the INCLUDE environment variable
IF(WIN32)
FIND_PATH(PATH_GL GL\\gl.h)
......
#if defined TARGET_HAS_ThirdPartyModulesForCoAdaptStimulator
#include "ovexP300ScreenLayoutReader.h"
#include <stdexcept>
......@@ -299,3 +301,6 @@ void P300ScreenLayoutReader::readPropertiesFromFile(CString propertyFile)
}
}
}
#endif
\ No newline at end of file
#if defined TARGET_HAS_ThirdPartyModulesForCoAdaptStimulator
#include "../../src/evidence-accumulation/ovexP300CEvidenceAccumulator.h"
#include "../../src/sequence/ovexP300RipRandSequenceGenerator.h"
......@@ -182,3 +185,15 @@ int main(int argc, char *argv[])
}
#else
#include <iostream>
int main(int argc, char *argv[])
{
std::cout << "Not compiled, dependencies not met\n";
return -1;
}
#endif
\ No newline at end of file
......@@ -100,13 +100,13 @@ XML::boolean IXMLNodeImpl::hasAttribute(const char *sAttributeName) const
const char* IXMLNodeImpl::getAttribute(const char *sAttributeName) const
{
const char* res = NULL;
try
{
res = m_mAttibuteMap.at(sAttributeName).c_str();
}
catch (const std::out_of_range&)
{
const std::string l_sAttributeName(sAttributeName);
std::map<std::string, std::string>::const_iterator it = m_mAttibuteMap.find(l_sAttributeName);
if(it!=m_mAttibuteMap.end()) {
res = (*it).second.c_str();
}
return res;
}
......
......@@ -101,10 +101,10 @@ boolean CAlgorithmClassifierOneVsOne::train(const IFeatureVectorSet& rFeatureVec
CString l_pParameterName = l_pAlgoProxy->getInputParameterName(OVP_Algorithm_OneVsOneStrategy_InputParameterId_DecisionType);
m_oPairwiseDecisionIdentifier=this->getTypeManager().getEnumerationEntryValueFromName(OVP_TypeId_ClassificationPairwiseStrategy,
l_pExtraParameters->at(l_pParameterName));
(*l_pExtraParameters)[l_pParameterName]);
if(m_oPairwiseDecisionIdentifier==OV_UndefinedIdentifier) {
this->getLogManager() << LogLevel_Error << "Tried to get algorithm id for pairwise decision strategy " << OVP_TypeId_ClassificationPairwiseStrategy << " and " << l_pParameterName << " -> "
<< ip_pExtraParameters->at(l_pParameterName) << " but failed\n";
<< (*l_pExtraParameters)[l_pParameterName] << " but failed\n";
return false;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment