From 8c72e30c8d95bbba3462bb6e8266dd97153519a5 Mon Sep 17 00:00:00 2001
From: Jonas Stienen <jst@akustik.rwth-aachen.de>
Date: Fri, 21 Aug 2020 09:38:57 +0200
Subject: [PATCH] WIP api changes
---
.../CombinedModel/PropagationEngine.cpp | 5 +++++
tests/CombinedModel/CombinedModelTest.cpp | 6 +++---
tests/CombinedModel/GRAS_scene5.cpp | 3 +--
tests/CombinedModel/GRAS_scene6.cpp | 3 +--
tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp | 3 +--
5 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp b/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp
index ce6b063..67a3e82 100644
--- a/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp
+++ b/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp
@@ -132,6 +132,11 @@ void ITAPropagationPathSim::CombinedModel::CPathEngine::UpdateEmitter( shared_pt
}
}
+void ITAPropagationPathSim::CombinedModel::CPathEngine::UpdateSensor( shared_ptr< CSensor > pSensor )
+{
+ ITA_EXCEPT_NOT_IMPLEMENTED;
+}
+
void ITAPropagationPathSim::CombinedModel::CPathEngine::ApplyEmitter( shared_ptr<ITAGeo::CEmitter> pEmitter )
{
if( m_pProgressHandler )
diff --git a/tests/CombinedModel/CombinedModelTest.cpp b/tests/CombinedModel/CombinedModelTest.cpp
index 40ec411..8afca14 100644
--- a/tests/CombinedModel/CombinedModelTest.cpp
+++ b/tests/CombinedModel/CombinedModelTest.cpp
@@ -179,7 +179,7 @@ int main( int iNumInArgs, char* pcInArgs[] )
sw.start();
pPathEngine->InitializePathEnvironment( pMeshModelList );
- pPathEngine->ApplyEmitterForTestingOnlyTreeAndImageEdges( pSource ); //Builds tree and image edges
+ pPathEngine->UpdateEmitter( pSource ); //Builds tree and image edges
d1 = sw.stop();
cout << "Calculation time pre-processing of path environment: " << timeToString( d1 ) << endl;
@@ -187,13 +187,13 @@ int main( int iNumInArgs, char* pcInArgs[] )
sw.start();
- pPathEngine->ApplyEmitterForTestingOnlyImageSources();
+ pPathEngine->UpdateSensor( pReceiver );
d2 = sw.stop();
cout << "Calculation time applying emitter: " << timeToString( d2 ) << endl;
sw.start();
- pPathEngine->ApplySensor( pReceiver );
+ pPathEngine->UpdateSensor( pReceiver );
d3 = sw.stop();
cout << "Calculation time applying sensor: " << timeToString( d3 ) << endl;
diff --git a/tests/CombinedModel/GRAS_scene5.cpp b/tests/CombinedModel/GRAS_scene5.cpp
index f009668..d7881c3 100644
--- a/tests/CombinedModel/GRAS_scene5.cpp
+++ b/tests/CombinedModel/GRAS_scene5.cpp
@@ -172,8 +172,7 @@ int main( int, char** )
pPathEngine->SetSimulationConfiguration( oSimConf );
pPathEngine->SetAbortionCriteria( oAbort );
pPathEngine->InitializePathEnvironment( pMeshModelList );
- pPathEngine->ApplyEmitter( scene.pEmitter );
- pPathEngine->ApplySensor( scene.pSensor );
+ pPathEngine->SetEntities( scene.pEmitter, scene.pSensor );
CPropagationPathList oPathList;
pPathEngine->ConstructPropagationPaths( oPathList );
cout << "\t -> found " << oPathList.size() << " visible paths" << endl;
diff --git a/tests/CombinedModel/GRAS_scene6.cpp b/tests/CombinedModel/GRAS_scene6.cpp
index 51bb70c..3aaf4dd 100644
--- a/tests/CombinedModel/GRAS_scene6.cpp
+++ b/tests/CombinedModel/GRAS_scene6.cpp
@@ -163,8 +163,7 @@ int main( int, char** )
pPathEngine->SetSimulationConfiguration( oSimConf );
pPathEngine->SetAbortionCriteria( oAbort );
pPathEngine->InitializePathEnvironment( pMeshModelList );
- pPathEngine->ApplyEmitter( scene.pEmitter );
- pPathEngine->ApplySensor( scene.pSensor );
+ pPathEngine->SetEntities( scene.pEmitter, scene.pSensor );
CPropagationPathList oPathList;
pPathEngine->ConstructPropagationPaths( oPathList );
cout << "\t -> found " << oPathList.size() << " visible paths" << endl;
diff --git a/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp b/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp
index 2e1e66b..9b4661d 100644
--- a/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp
+++ b/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp
@@ -147,8 +147,7 @@ int main( int, char** )
pPathEngine->SetAbortionCriteria( oAbort );
pPathEngine->InitializePathEnvironment( pMeshModelList );
// Path finding
- pPathEngine->ApplyEmitter( pEmitter );
- pPathEngine->ApplySensor( pSensor );
+ pPathEngine->SetEntities( pEmitter, pSensor );
CPropagationPathList oPathList;
pPathEngine->ConstructPropagationPaths( oPathList );
cout << "\t -> found " << oPathList.size() << " visible paths" << endl;
--
GitLab