Commit b19c6364 authored by Pascal Palenda's avatar Pascal Palenda
Browse files

Add namespace and file name changes to tests

parent 57bf4bdb
......@@ -4,8 +4,8 @@
#include <ITASimulationScheduler/Raven/RavenNetClient.h>
#include <ITASimulationScheduler/Raven/RavenNetServer.h>
#include <ITASimulationScheduler/Raven/R_RavenLocalScheduler.h>
#include <ITASimulationScheduler/Raven/R_RavenUtils.h>
#include <ITASimulationScheduler/LocalScheduler.h>
#include <ITASimulationScheduler/Utils.h>
#include <ITAStringUtils.h>
#include <ITAStopWatch.h>
......@@ -19,24 +19,24 @@ void test()
std::string sServerName = "localhost";
unsigned int uiPort = 12480;
IRavenNetServer::tPortList liFreePorts;
liFreePorts.push_back( IRavenNetServer::tPortRange( uiPort + 1, 12499 ) );
ITASimulationScheduler::RAVEN::IRavenNetServer::tPortList liFreePorts;
liFreePorts.push_back( ITASimulationScheduler::RAVEN::IRavenNetServer::tPortRange( uiPort + 1, 12499 ) );
std::cout << "This is the RavenNet simulation server" << std::endl;
std::cout << "Waiting for connections to " << sServerName << " on port " << uiPort << std::endl << std::endl;
// Create and set up Standalone Raven Simulator
std::string sRavenDataPath = "../../../VAData";
CLocalScheduler::CConfiguration oConf;
ITASimulationScheduler::CLocalScheduler::CConfiguration oConf;
oConf.sRavenDataBasePath = sRavenDataPath;
CLocalScheduler* pScheduler = new CLocalScheduler( oConf );
ITASimulationScheduler::CLocalScheduler* pScheduler = new ITASimulationScheduler::CLocalScheduler( oConf );
// Create server and connect Raven instance
IRavenNetServer* pServer = IRavenNetServer::Create();
pServer->SetRavenSimulationScheduler( ( ISimulationSchedulerInterface* ) pScheduler );
ITASimulationScheduler::RAVEN::IRavenNetServer* pServer = ITASimulationScheduler::RAVEN::IRavenNetServer::Create();
pServer->SetRavenSimulationScheduler( ( ITASimulationScheduler::ISimulationSchedulerInterface* ) pScheduler );
int err = pServer->Initialize( sServerName, ( int ) uiPort, liFreePorts, IRavenNetServer::SCHEDULER );
if( err != IRavenNetServer::RAVEN_NO_ERROR ) {
int err = pServer->Initialize( sServerName, ( int ) uiPort, liFreePorts, ITASimulationScheduler::RAVEN::IRavenNetServer::SCHEDULER );
if( err != ITASimulationScheduler::RAVEN::IRavenNetServer::RAVEN_NO_ERROR ) {
std::cout << "Could not initialize Raven simulation server" << std::endl;
}
else {
......@@ -49,38 +49,38 @@ void test()
std::cout << "Raven simulation server provides (serial) simulator (SimulationInterface)" << std::endl;
IRavenNetClient* pClient = IRavenNetClient::Create();
ITASimulationScheduler::RAVEN::IRavenNetClient* pClient = ITASimulationScheduler::RAVEN::IRavenNetClient::Create();
pClient->Initialize( sServerName );
ISimulationSchedulerInterface* pRemoteScheduler = pClient->GetRavenSimulationScheduler();
ITASimulationScheduler::ISimulationSchedulerInterface* pRemoteScheduler = pClient->GetRavenSimulationScheduler();
pRemoteScheduler->Reset();
CSimulationResultDumper oResultDumper( "./Output" );
ITASimulationScheduler::CSimulationResultDumper oResultDumper( "./Output" );
pRemoteScheduler->AttachSimulationResultHandler( &oResultDumper );
CSimulationTask oTask;
ITASimulationScheduler::CSimulationTask oTask;
oTask.oConfig.oGeometry.sSceneFileName = "$(RavenDataBasePath)/Models/San Juan/SJ Double-Chapel Centered.ac";
oTask.oConfig.SetDefaults();
oTask.oScene.AddReceiver( 0 );
CSourceState oState;
ITASimulationScheduler::RAVEN::CSourceState oState;
oTask.oScene.AddSource( 0 );
oState.vPos.init( 2, 1.7f, 2 );
oTask.oScene.SetSourceState( 0, oState );
unsigned int uiIDCounter = 0;
CSimulationTask oTask1( oTask );
ITASimulationScheduler::CSimulationTask oTask1( oTask );
oTask1.uiID = uiIDCounter++;
oTask1.iSimulationType = CSimulationTask::SIM_DS;
oTask1.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DS;
CSimulationTask oTask2( oTask );
ITASimulationScheduler::CSimulationTask oTask2( oTask );
oTask2.uiID = uiIDCounter++;
oTask2.iSimulationType = CSimulationTask::SIM_ER_IS;
oTask2.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_ER_IS;
CSimulationTask oTask3( oTask );
ITASimulationScheduler::CSimulationTask oTask3( oTask );
oTask3.uiID = uiIDCounter++;
oTask3.iSimulationType = CSimulationTask::SIM_DD_RT;
oTask3.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DD_RT;
ITAStopWatch sw1;
for( int i = 0; i < 10000; i++ )
......@@ -92,7 +92,7 @@ void test()
}
std::cout << "Added 10k DS tasks in " << sw1.ToString() << std::endl;
ISimulationSchedulerInterface::CProfiler oProfilerState;
ITASimulationScheduler::ISimulationSchedulerInterface::CProfiler oProfilerState;
if( pRemoteScheduler->GetProfilerStatus( oProfilerState ) )
{
cout << oProfilerState.oAll.dTaskComputeAvrg << endl;
......
......@@ -3,10 +3,10 @@
#include <ITASimulationScheduler/Raven/RavenNetClient.h>
// Raven includes
#include <ITASimulationScheduler/Raven/R_Raven.h>
#include <ITASimulationScheduler/Raven/R_RavenSimulator.h>
#include <ITASimulationScheduler/Raven/R_RavenLocalScheduler.h>
#include <ITASimulationScheduler/Raven/R_RavenUtils.h>
#include <ITASimulationScheduler/Interfaces.h>
#include <ITASimulationScheduler/Raven/Simulator.h>
#include <ITASimulationScheduler/LocalScheduler.h>
#include <ITASimulationScheduler/Utils.h>
// ITA includes
#include <ITADebug.h>
......@@ -29,7 +29,7 @@ static const string sRavenProjectPath = "$(RavenDataBasePath)/Models/Quader/quad
void normalize_0dB( ITASampleFrame* );
void testSimulator( ISimulationInterface* pRavenSimulator )
void testSimulator( ITASimulationScheduler::ISimulationInterface* pRavenSimulator )
{
cout << " * Loading scene geometry ... ";
pRavenSimulator->LoadScene( sRavenProjectPath );
......@@ -37,19 +37,19 @@ void testSimulator( ISimulationInterface* pRavenSimulator )
int iCounter = 0;
CReceiverState oReceiverState;
ITASimulationScheduler::RAVEN::CReceiverState oReceiverState;
oReceiverState.vPos.init( 0.1f, 1.6f, 0.9f );
oReceiverState.vView.init( 0, 0, -1 );
oReceiverState.vUp.init( 0, 1, 0 );
oReceiverState.sHRIRFilename = "$(RavenDataBasePath)/HRIR/ITA-Kunstkopf_HRIR_Mess01_D180_1x5_128.daff";
CSourceState oSourceState;
ITASimulationScheduler::RAVEN::CSourceState oSourceState;
oSourceState.vPos.init( 1, 0.5f, -1.1f );
oSourceState.vView.init( 0, 0, 1 );
oSourceState.vUp.init( 0, 1, 0 );
oSourceState.sDirectivityFilename = "$(RavenDataBasePath)/Directivity/Slenczka_2005_energetic_3d_octave/Bratsche.daff";
CSimulationTask oTask1;
ITASimulationScheduler::CSimulationTask oTask1;
oTask1.oScene.AddReceiver( 0 );
oTask1.oScene.SetReceiverState( 0, oReceiverState );
oTask1.oScene.AddSource( 0 );
......@@ -57,18 +57,18 @@ void testSimulator( ISimulationInterface* pRavenSimulator )
oTask1.oConfig.SetDefaults();
oTask1.uiID = ( unsigned int ) iCounter++;
oTask1.uiReferenceID = 0;
oTask1.iSimulationType = CSimulationTask::SIM_DS;
oTask1.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DS;
oTask1.oConfig.oGeometry.sSceneFileName = sRavenProjectPath;
CSimulationTask oTask2( oTask1 );
ITASimulationScheduler::CSimulationTask oTask2( oTask1 );
oTask2.uiID = ( unsigned int ) iCounter++;
oTask2.iSimulationType = CSimulationTask::SIM_ER_IS;
CSimulationTask oTask3( oTask1 );
oTask2.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_ER_IS;
ITASimulationScheduler::CSimulationTask oTask3( oTask1 );
oTask3.uiID = ( unsigned int ) iCounter++;
oTask3.iSimulationType = CSimulationTask::SIM_DD_RT;
oTask3.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DD_RT;
ITAStopWatch swInit, swSimDS, swSimIS, swSimRT;
CSimulationResult oResult;
ITASimulationScheduler::CSimulationResult oResult;
// Initial config adaption
cout << "Sending initial configuration ..." << endl;
......@@ -129,11 +129,11 @@ void testSimulator( ISimulationInterface* pRavenSimulator )
return;
}
void testScheduler( ISimulationSchedulerInterface* pRavenScheduler )
void testScheduler( ITASimulationScheduler::ISimulationSchedulerInterface* pRavenScheduler )
{
// ResultHandler angeben, um Resultate abzufangen
CSimulationResultDumper oDumper( "./" );
ITASimulationScheduler::CSimulationResultDumper oDumper( "./" );
pRavenScheduler->AttachSimulationResultHandler( &oDumper );
// Preload scene
......@@ -144,32 +144,32 @@ void testScheduler( ISimulationSchedulerInterface* pRavenScheduler )
pRavenScheduler->LoadScene( sRavenProjectPath );
CReceiverState oReceiverState;
ITASimulationScheduler::RAVEN::CReceiverState oReceiverState;
oReceiverState.vPos.init( 0.1f, 1.6f, 0.9f );
oReceiverState.vView.init( 0, 0, -1 );
oReceiverState.vUp.init( 0, 1, 0 );
//oReceiverState.sHRIRFilename = "$(RavenDataBasePath)/HRIR/ITA-Kunstkopf_HRIR_Mess01_D180_1x5_128.daff";
CSourceState oSourceState;
ITASimulationScheduler::RAVEN::CSourceState oSourceState;
oSourceState.vPos.init( 1, 0.5f, -0.1f );
oSourceState.vView.init( 0, 0, 1 );
oSourceState.vUp.init( 0, 1, 0 );
//oSourceState.sDirectivityFilename = "$(RavenDataBasePath)/Directivity/Slenczka_2005_energetic_3d_octave/Bratsche.daff";
CSimulationTask oTask1;
ITASimulationScheduler::CSimulationTask oTask1;
oTask1.oScene.AddReceiver( 0 );
oTask1.oScene.SetReceiverState( 0, oReceiverState );
oTask1.oScene.AddSource( 0 );
oTask1.oScene.SetSourceState( 0, oSourceState );
oTask1.iSimulationType = CSimulationTask::SIM_DS;
oTask1.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DS;
oTask1.uiReferenceID = 0;
oTask1.oConfig.SetDefaults();
oTask1.oConfig.oGeometry.sSceneFileName = sRavenProjectPath;
CSimulationTask oTask2( oTask1 );
oTask2.iSimulationType = CSimulationTask::SIM_ER_IS;
CSimulationTask oTask3( oTask1 );
oTask3.iSimulationType = CSimulationTask::SIM_DD_RT;
ITASimulationScheduler::CSimulationTask oTask2( oTask1 );
oTask2.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_ER_IS;
ITASimulationScheduler::CSimulationTask oTask3( oTask1 );
oTask3.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DD_RT;
int iNumTasksAdded = 0;
......@@ -233,14 +233,14 @@ int main( int argc, char* argv[] )
string sServerAdress = string( argv[ 1 ] );
IRavenNetClient* pClient = IRavenNetClient::Create();
ITASimulationScheduler::RAVEN::IRavenNetClient* pClient = ITASimulationScheduler::RAVEN::IRavenNetClient::Create();
int iPort = 12480;
cout << "Attempting to connect to " << sServerAdress << " on port " << iPort << endl;
int err;
if( ( err = pClient->Initialize( sServerAdress, iPort ) ) != IRavenNetClient::RAVEN_NO_ERROR )
if( ( err = pClient->Initialize( sServerAdress, iPort ) ) != ITASimulationScheduler::RAVEN::IRavenNetClient::RAVEN_NO_ERROR )
{
cout << "[ERROR] " << err << endl;
return 255;
......@@ -249,7 +249,7 @@ int main( int argc, char* argv[] )
if( pClient->IsConnected() )
cout << "Successfully connected to Raven server!" << endl;
pClient->SetExceptionHandlingMode( IRavenNetClient::EXC_SERVER_PRINT );
pClient->SetExceptionHandlingMode( ITASimulationScheduler::RAVEN::IRavenNetClient::EXC_SERVER_PRINT );
// --- Raven steuern ---
......@@ -284,7 +284,7 @@ int main( int argc, char* argv[] )
std::cout << "Server has no scheduler" << std::endl;
}
if( pClient->Disconnect() == IRavenNetClient::RAVEN_NO_ERROR )
if( pClient->Disconnect() == ITASimulationScheduler::RAVEN::IRavenNetClient::RAVEN_NO_ERROR )
cout << " * Successfully disconnected." << endl;
delete pClient;
......
......@@ -3,8 +3,8 @@
#include <ITASimulationScheduler/Raven/RavenNetServer.h>
#include <ITASimulationScheduler/Raven/R_RavenSimulator.h>
#include <ITASimulationScheduler/Raven/R_RavenLocalScheduler.h>
#include <ITASimulationScheduler/Raven/Simulator.h>
#include <ITASimulationScheduler/LocalScheduler.h>
#include <ITAFilesystemUtils.h>
......@@ -31,35 +31,35 @@ int main(int argc, char** argv) {
string sServerName = "0.0.0.0"; // all interfaces
unsigned int uiPort = 12480;
IRavenNetServer::tPortList liFreePorts;
liFreePorts.push_back( IRavenNetServer::tPortRange( uiPort+1, 12499 ) );
ITASimulationScheduler::RAVEN::IRavenNetServer::tPortList liFreePorts;
liFreePorts.push_back( ITASimulationScheduler::RAVEN::IRavenNetServer::tPortRange( uiPort+1, 12499 ) );
cout << "Waiting for connections on all interfaces using port " << uiPort << endl;
IRavenNetServer* pServer = IRavenNetServer::Create();
ITASimulationScheduler::RAVEN::IRavenNetServer* pServer = ITASimulationScheduler::RAVEN::IRavenNetServer::Create();
int iMode = IRavenNetServer::SCHEDULER;
int iMode = ITASimulationScheduler::RAVEN::IRavenNetServer::SCHEDULER;
if (iMode & IRavenNetServer::SIMULATOR)
if (iMode & ITASimulationScheduler::RAVEN::IRavenNetServer::SIMULATOR)
{
// Create and set up Standalone Raven Simulator
CRavenSimulator* pSimulator = new CRavenSimulator(sRavenDataBasePath);
ITASimulationScheduler::RAVEN::CRavenSimulator* pSimulator = new ITASimulationScheduler::RAVEN::CRavenSimulator(sRavenDataBasePath);
// Create server and connect Raven instance
pServer->SetRavenSimulator( (ISimulationInterface*) pSimulator );
pServer->SetRavenSimulator( (ITASimulationScheduler::ISimulationInterface*) pSimulator );
}
if (iMode & IRavenNetServer::SCHEDULER)
if (iMode & ITASimulationScheduler::RAVEN::IRavenNetServer::SCHEDULER)
{
// Create and set up Raven Scheduler on this machine
CLocalScheduler::CConfiguration oConf;
ITASimulationScheduler::CLocalScheduler::CConfiguration oConf;
oConf.sRavenDataBasePath = sRavenDataBasePath;
CLocalScheduler* pScheduler = new CLocalScheduler( oConf );
pServer->SetRavenSimulationScheduler( (ISimulationSchedulerInterface*) pScheduler );
ITASimulationScheduler::CLocalScheduler* pScheduler = new ITASimulationScheduler::CLocalScheduler( oConf );
pServer->SetRavenSimulationScheduler( (ITASimulationScheduler::ISimulationSchedulerInterface*) pScheduler );
}
// Start
if( pServer->Initialize(sServerName, (int) uiPort, liFreePorts, iMode) != IRavenNetServer::RAVEN_NO_ERROR ) {
if( pServer->Initialize(sServerName, (int) uiPort, liFreePorts, iMode) != ITASimulationScheduler::RAVEN::IRavenNetServer::RAVEN_NO_ERROR ) {
cerr << "Could not initialize server" << endl;
}
......@@ -70,4 +70,4 @@ int main(int argc, char** argv) {
pServer->Finalize(); // Lscht auch den Simulator
return 0;
}
\ No newline at end of file
}
......@@ -23,7 +23,7 @@
#include <ITASimulationScheduler/Raven/RavenNetServer.h>
#include <ITASimulationScheduler/Raven/R_RavenLocalScheduler.h>
#include <ITASimulationScheduler/LocalScheduler.h>
using namespace std;
......@@ -37,24 +37,24 @@ int main( int argc, void** argv ) {
//string sServerName = "192.168.1.100";
//string sServerName = "137.226.61.244"; // vrakustik3 ita netz
unsigned int uiPort = 12480;
IRavenNetServer::tPortList liFreePorts;
liFreePorts.push_back( IRavenNetServer::tPortRange( uiPort + 1, 12499 ) );
ITASimulationScheduler::RAVEN::IRavenNetServer::tPortList liFreePorts;
liFreePorts.push_back( ITASimulationScheduler::RAVEN::IRavenNetServer::tPortRange( uiPort + 1, 12499 ) );
cout << "This is the RavenNet simulation server" << endl;
cout << "Waiting for connections to " << sServerName << " on port " << uiPort << endl << endl;
// Create and set up Standalone Raven Simulator
std::string sRavenDataPath = "../../../VAData";
CLocalScheduler::CConfiguration oConf;
ITASimulationScheduler::CLocalScheduler::CConfiguration oConf;
oConf.sRavenDataBasePath = sRavenDataPath;
CLocalScheduler* pScheduler = new CLocalScheduler( oConf );
ITASimulationScheduler::CLocalScheduler* pScheduler = new ITASimulationScheduler::CLocalScheduler( oConf );
// Create server and connect Raven instance
IRavenNetServer* pServer = IRavenNetServer::Create();
pServer->SetRavenSimulationScheduler( ( ISimulationSchedulerInterface* ) pScheduler );
ITASimulationScheduler::RAVEN::IRavenNetServer* pServer = ITASimulationScheduler::RAVEN::IRavenNetServer::Create();
pServer->SetRavenSimulationScheduler( ( ITASimulationScheduler::ISimulationSchedulerInterface* ) pScheduler );
int err = pServer->Initialize( sServerName, ( int ) uiPort, liFreePorts, IRavenNetServer::SCHEDULER );
if( err != IRavenNetServer::RAVEN_NO_ERROR ) {
int err = pServer->Initialize( sServerName, ( int ) uiPort, liFreePorts, ITASimulationScheduler::RAVEN::IRavenNetServer::SCHEDULER );
if( err != ITASimulationScheduler::RAVEN::IRavenNetServer::RAVEN_NO_ERROR ) {
cout << "[ERROR] Could not initialize Raven simulation server" << endl;
}
else {
......@@ -73,4 +73,4 @@ int main( int argc, void** argv ) {
pServer->Finalize(); // Lscht auch den Simulator
return 0;
}
\ No newline at end of file
}
......@@ -7,7 +7,7 @@
#include <ITAStopWatch.h>
#include <ITAStringUtils.h>
#include <ITASimulationScheduler/Raven/R_RavenSimulator.h>
#include <ITASimulationScheduler/Raven/Simulator.h>
#include <RG_Vector.h>
using namespace std;
......@@ -22,8 +22,8 @@ void normalize_0dB( ITASampleFrame* );
int main( int argc, char** argv ) {
ISimulationInterface* pRavenSimulator;
pRavenSimulator = ( ISimulationInterface* ) new CRavenSimulator( sRavenDataBasePath );
ITASimulationScheduler::ISimulationInterface* pRavenSimulator;
pRavenSimulator = ( ITASimulationScheduler::ISimulationInterface* ) new ITASimulationScheduler::RAVEN::CRavenSimulator( sRavenDataBasePath );
ITAStopWatch sw;
......@@ -36,40 +36,40 @@ int main( int argc, char** argv ) {
sw.start();
cout << "\tSetting up scene, config, tasks and result ...\n";
CReceiverState oReceiverState;
ITASimulationScheduler::RAVEN::CReceiverState oReceiverState;
oReceiverState.vPos.init( 0, 1.6f, 0 );
oReceiverState.vView.init( 0, 0, -1 );
oReceiverState.vUp.init( 0, 1, 0 );
oReceiverState.sHRIRFilename = "$(RavenDataBasePath)/HRIR/ITA-Kunstkopf_HRIR_Mess01_D180_1x5_128.daff";
CSourceState oSourceState;
ITASimulationScheduler::RAVEN::CSourceState oSourceState;
oSourceState.vPos.init( 0, 1.5f, 0 );
oSourceState.vView.init( 0, 0, -1 );
oSourceState.vUp.init( 0, 1, 0 );
oSourceState.sDirectivityFilename = "$(RavenDataBasePath)/Directivity/Slenczka_2005_energetic_3d_octave/Bratsche.daff";
CSimulationTask oTask1;
ITASimulationScheduler::CSimulationTask oTask1;
oTask1.oScene.AddReceiver( 0 );
oTask1.oScene.SetReceiverState( 0, oReceiverState );
oTask1.oScene.AddSource( 0 );
oTask1.oScene.SetSourceState( 0, oSourceState );
oTask1.iSimulationType = CSimulationTask::SIM_DS;
oTask1.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DS;
oTask1.uiID = 0;
oTask1.oConfig.SetDefaults();
oTask1.oConfig.oGeometry.sSceneFileName = sRavenGeometryFilePath;
CSimulationTask oTask2( oTask1 );
ITASimulationScheduler::CSimulationTask oTask2( oTask1 );
oTask2.uiID++;
oTask2.iSimulationType = CSimulationTask::SIM_ER_IS;
CSimulationTask oTask3( oTask2 );
oTask2.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_ER_IS;
ITASimulationScheduler::CSimulationTask oTask3( oTask2 );
oTask3.uiID++;
oTask3.iSimulationType = CSimulationTask::SIM_DD_RT;
CSimulationTask oTask4( oTask3 );
oTask3.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DD_RT;
ITASimulationScheduler::CSimulationTask oTask4( oTask3 );
oTask4.uiID++;
oTask4.iSimulationType = CSimulationTask::SIM_DS | CSimulationTask::SIM_ER_IS;
oTask4.iSimulationType = ITASimulationScheduler::CSimulationTask::SIM_DS | ITASimulationScheduler::CSimulationTask::SIM_ER_IS;
cout << oTask1.oConfig.ToString() << endl;
CSimulationResult oResult;
ITASimulationScheduler::CSimulationResult oResult;
cout << "\t[done in " << timeToString( sw.stop() ) << "]" << endl;
......@@ -95,7 +95,7 @@ int main( int argc, char** argv ) {
if( oResult.vcspResult[ 0 ]->bEmpty )
{
cout << "\tWarning, IS-Result-Filter is empty!\n";
static_cast< CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
static_cast< ITASimulationScheduler::RAVEN::CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
}
normalize_0dB( oResult.vcspResult[ 0 ]->psfResult );
writeAudiofile( "RavenTest_Task_IS_v1 .wav", oResult.vcspResult[ 0 ]->psfResult, dSampleRate );
......@@ -109,7 +109,7 @@ int main( int argc, char** argv ) {
if( oResult.vcspResult[ 0 ]->bEmpty )
{
cout << "\tWarning, IS-Result-Filter is empty!\n";
static_cast< CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
static_cast< ITASimulationScheduler::RAVEN::CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
}
normalize_0dB( oResult.vcspResult[ 0 ]->psfResult );
writeAudiofile( "RavenTest_Task_IS_v2.wav", oResult.vcspResult[ 0 ]->psfResult, dSampleRate );
......@@ -123,7 +123,7 @@ int main( int argc, char** argv ) {
if( oResult.vcspResult[ 0 ]->bEmpty )
{
cout << "\tWarning, DSIS-Result-Filter is empty!\n";
static_cast< CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
static_cast< ITASimulationScheduler::RAVEN::CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
}
normalize_0dB( oResult.vcspResult[ 0 ]->psfResult );
writeAudiofile( "RavenTest_Task_DSIS_v1 .wav", oResult.vcspResult[ 0 ]->psfResult, dSampleRate );
......@@ -139,7 +139,7 @@ int main( int argc, char** argv ) {
if( oResult.vcspResult[ 0 ]->bEmpty )
{
cout << "\tWarning, RT-Result-Filter is empty!\n";
static_cast< CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
static_cast< ITASimulationScheduler::RAVEN::CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
}
normalize_0dB( oResult.vcspResult[ 0 ]->psfResult );
writeAudiofile( "RavenTest_Task_RT_v1.wav", oResult.vcspResult[ 0 ]->psfResult, dSampleRate );
......@@ -153,7 +153,7 @@ int main( int argc, char** argv ) {
if( oResult.vcspResult[ 0 ]->bEmpty )
{
cout << "\tWarning, RT-Result-Filter is empty!\n";
static_cast< CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
static_cast< ITASimulationScheduler::RAVEN::CRavenSimulator* >( pRavenSimulator )->WriteToRPF( "Problembaer.rpf" );
}
normalize_0dB( oResult.vcspResult[ 0 ]->psfResult );
writeAudiofile( "RavenTest_Task_IS_v2.wav", oResult.vcspResult[ 0 ]->psfResult, dSampleRate );
......
......@@ -25,7 +25,7 @@
#include <ITAStringUtils.h>
#include <ITAStopWatch.h>
#include <ITAStringUtils.h>
#include <ITASimulationScheduler/Raven/R_RavenConfig.h>
#include <ITASimulationScheduler/Raven/Config.h>
static std::string g_sServerName = "10.0.1.25";
static int g_iServerPort = 12480;
......@@ -73,4 +73,4 @@ int main( int argc, char** argv )
oConnection.Close( false );
return 0;
}
\ No newline at end of file
}
......@@ -29,7 +29,7 @@
//#include <VistaBase/VistaTimeUtils.h>
#include <ITASimulationScheduler/Raven/R_RavenConfig.h>
#include <ITASimulationScheduler/Raven/Config.h>
static int g_iServerPort = 12480;
......
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