Commit 7b1dc2b9 authored by Pascal Palenda's avatar Pascal Palenda
Browse files

Change namespace naming style - WIP

parent 75a06d4c
......@@ -54,9 +54,9 @@
using namespace std;
using namespace ITA::simulation_scheduler;
using namespace room_acoustics;
using namespace raven;
using namespace ITA::SimulationScheduler;
using namespace RoomAcoustics;
using namespace Raven;
void normalize_0dB( ITASampleFrame* );
......
......@@ -8,10 +8,10 @@
#include <filesystem>
#include <VistaBase/VistaTimeUtils.h>
using namespace ITA::simulation_scheduler;
using namespace room_acoustics;
using namespace audibility_filter;
using namespace raven;
using namespace ITA::SimulationScheduler;
using namespace RoomAcoustics;
using namespace AudibilityFilter;
using namespace Raven;
struct ResultDump : IResultHandler
{
......@@ -70,7 +70,7 @@ int main ( )
std::ofstream myfile;
myfile.open ( "CompleteTest_Master_Test_Config.json" );
myfile << utils::JSONConfigUtils::WriteVistaPropertyListToJSON ( oConfig.Store ( ) ).write_formatted ( );
myfile << Utils::JSONConfigUtils::WriteVistaPropertyListToJSON ( oConfig.Store ( ) ).write_formatted ( );
myfile.close ( );
auto masterController = std::make_unique<CMasterSimulationController> ( oConfig );
......@@ -99,7 +99,7 @@ int main ( )
std::ofstream myProfile;
myProfile.open ( "profiler.json" );
myProfile << ::profiler::ProfilerToJson ( ).str ( );
myProfile << ::Profiler::ProfilerToJson ( ).str ( );
myProfile.close ( );
return 0;
......
......@@ -11,7 +11,7 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
///
/// \brief Models a source or receiver in 3D space.
......@@ -153,7 +153,7 @@ namespace ITA
lhs.GetOrientation ( ) == rhs.GetOrientation ( );
}
} // namespace simulation_scheduler
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_3D_OBJECT
......@@ -14,11 +14,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief The interface for an audibility filter.
......@@ -141,8 +141,8 @@ namespace ITA
///
static std::map<std::string, CreateCallback> m_mFilters;
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_AUDIBILITY_FILTER_INTERFACE
\ No newline at end of file
......@@ -15,11 +15,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief This class models a network of audibility filters.
......@@ -163,8 +163,8 @@ namespace ITA
///
std::unique_ptr<NetworkTreeNode> m_pNetworkTree;
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_FILTER_NETWORK
\ No newline at end of file
......@@ -12,11 +12,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief Perceptive rotation filter.
......@@ -111,8 +111,8 @@ namespace ITA
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_PERCEPTIVE_ROTATION_FILTER
\ No newline at end of file
......@@ -12,11 +12,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief Rate filter
......@@ -80,8 +80,8 @@ namespace ITA
///
double m_dRate;
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_RATE_FILTER
\ No newline at end of file
......@@ -9,11 +9,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief Reverberation radius filter
......@@ -77,8 +77,8 @@ namespace ITA
///
double m_dReverberationRadius;
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_REVERBERATION_RADIUS_FILTER
\ No newline at end of file
......@@ -12,11 +12,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief Rotation filter
......@@ -131,8 +131,8 @@ namespace ITA
///
RotationModes m_eRotationMode = RotationModes::absolute;
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_ROTATION_FILTER
\ No newline at end of file
......@@ -9,11 +9,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief Translation filter
......@@ -94,8 +94,8 @@ namespace ITA
///
TranslationModes m_eTranslationMode = TranslationModes::absolute;
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_TRANSLATION_FILTER
\ No newline at end of file
......@@ -12,11 +12,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class CUpdateScene;
namespace audibility_filter
namespace AudibilityFilter
{
///
/// \brief Zone filter.
......@@ -85,8 +85,8 @@ namespace ITA
///
std::vector<std::pair<VistaVector3D, VistaVector3D>> m_vpZones;
};
} // namespace audibility_filter
} // namespace simulation_scheduler
} // namespace AudibilityFilter
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_AUDIBILITY_FILTER_ZONE_FILTER
\ No newline at end of file
......@@ -9,7 +9,7 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
///
/// \brief Interface for a configuration.
......@@ -29,7 +29,7 @@ namespace ITA
///
virtual void Load ( const VistaPropertyList& oProperties ) = 0;
};
} // namespace simulation_scheduler
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_CONFIG_INTERFACE
......@@ -12,7 +12,7 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
///
/// \brief Result of a room acoustic simulation.
......@@ -68,7 +68,7 @@ namespace ITA
std::unique_ptr<CSimulationResult> Clone ( ) const override;
};
} // namespace simulation_scheduler
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_IR_SIMULATION_RESULT
\ No newline at end of file
......@@ -13,7 +13,7 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
#ifdef WITH_PROFILER
///
......@@ -32,18 +32,18 @@ namespace ITA
///
/// \brief Issue an event with the name \p NAME.
///
#define PROFILER_EVENT_COUNT( NAME) profiler::AddEventCount( NAME, __FUNCTION__, __FILE__ );
#define PROFILER_EVENT_COUNT( NAME) Profiler::AddEventCount( NAME, __FUNCTION__, __FILE__ );
///
/// \brief Add the value \p VALUE to the profiler under the name \p NAME.
///
#define PROFILER_VALUE( NAME, VALUE) profiler::AddValue( NAME, VALUE, __FUNCTION__, __FILE__ );
#define PROFILER_VALUE( NAME, VALUE) Profiler::AddValue( NAME, VALUE, __FUNCTION__, __FILE__ );
///
/// \brief Start a section with the name \p NAME.
///
#define PROFILER_SECTION( NAME ) profiler::CSection PROFILER_UNIQUE_SECTION(__LINE__);\
profiler::StartSection(PROFILER_UNIQUE_SECTION(__LINE__), NAME, __FUNCTION__, __FILE__ );
#define PROFILER_SECTION( NAME ) Profiler::CSection PROFILER_UNIQUE_SECTION(__LINE__);\
Profiler::StartSection(PROFILER_UNIQUE_SECTION(__LINE__), NAME, __FUNCTION__, __FILE__ );
///
/// \brief Start a section with the name "Full".
......@@ -53,23 +53,23 @@ namespace ITA
///
/// \brief End the last opened section in this thread.
///
#define PROFILER_END_SECTION() profiler::EndSection();
#define PROFILER_END_SECTION() Profiler::EndSection();
///
/// \brief Name the current thread.
///
/// Only the first invocation of this has an effect.
///
#define PROFILER_NAME_THREAD( NAME ) profiler::NameThread( NAME );
#define PROFILER_NAME_THREAD( NAME ) Profiler::NameThread( NAME );
///
/// \brief Name the current thread "Main".
///
/// Only the first invocation of this has an effect.
///
#define PROFILER_NAME_THREAD_MAIN( ) profiler::NameThread( "Main" );
#define PROFILER_NAME_THREAD_MAIN( ) Profiler::NameThread( "Main" );
namespace profiler
namespace Profiler
{
class ProfileSection;
class CProfiler;
......@@ -189,7 +189,7 @@ namespace ITA
/// \brief Parse the profiler data as a json file.
///
std::stringstream ITA_SIMULATION_SCHEDULER_API ProfilerToJson ( );
} // namespace profiler
} // namespace Profiler
#else
#define PROFILER_EVENT_COUNT( ... )
......@@ -209,7 +209,7 @@ namespace ITA
///
void ITA_SIMULATION_SCHEDULER_API StoreProfilerData ( const std::string& sProfilerFileName );
} // namespace simulation_scheduler
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_PROFILER_PROFILER
\ No newline at end of file
......@@ -10,9 +10,9 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
namespace profiler
namespace Profiler
{
///
/// \brief Types of data that can be stored as a value.
......@@ -127,8 +127,8 @@ namespace ITA
///
double m_dTimeStamp = ITAClock::getDefaultClock ( )->getTime ( );
};
} // namespace profiler
} // namespace simulation_scheduler
} // namespace Profiler
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_PROFILER_PROFILER_TYPES
\ No newline at end of file
......@@ -12,7 +12,7 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
///
/// \brief Result handler interface.
......@@ -31,7 +31,7 @@ namespace ITA
///
virtual void PostResultReceived ( std::unique_ptr<CSimulationResult> pResult ) = 0;
};
} // namespace simulation_scheduler
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_RESULT_HANDLER
\ No newline at end of file
......@@ -26,11 +26,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
class IResultHandler;
namespace room_acoustics
namespace RoomAcoustics
{
///
/// \brief Primary interaction class for room acoustic simulations.
......@@ -207,8 +207,8 @@ namespace ITA
ITAAtomicBool m_bStopACK = false;
/// \}
};
} // namespace room_acoustics
} // namespace simulation_scheduler
} // namespace RoomAcoustics
} // namespace SimulationScheduler
} // namespace ITA
#endif // INCLUDE_WATCHER_ITA_SIMULATION_SCHEDULER_ROOM_ACOUSTICS_MASTER_SIMULATION_CONTROLLER
......@@ -19,11 +19,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
namespace room_acoustics
namespace RoomAcoustics
{
namespace raven
namespace Raven
{
///
/// \brief Scene class for Raven instances.
......@@ -228,12 +228,12 @@ namespace ITA
};
ENABLE_BITMASK_OPERATORS ( room_acoustics::raven::CRavenScene::CReceiverState::DifferenceFlags );
ENABLE_BITMASK_OPERATORS ( room_acoustics::raven::CRavenScene::CSourceState::DifferenceFlags );
ENABLE_BITMASK_OPERATORS ( RoomAcoustics::Raven::CRavenScene::CReceiverState::DifferenceFlags );
ENABLE_BITMASK_OPERATORS ( RoomAcoustics::Raven::CRavenScene::CSourceState::DifferenceFlags );
} // namespace raven
} // namespace room_acoustics
} // namespace simulation_scheduler
} // namespace Raven
} // namespace RoomAcoustics
} // namespace SimulationScheduler
} // namespace ITA
#endif
......
......@@ -23,11 +23,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
namespace room_acoustics
namespace RoomAcoustics
{
namespace raven
namespace Raven
{
///
......@@ -113,9 +113,9 @@ namespace ITA
std::vector< std::unique_ptr<ComplexSimulationSoundPath> > vcspResult; //!< Result container
};
} // namespace raven
} // namespace room_acoustics
} // namespace simulation_scheduler
} // namespace Raven
} // namespace RoomAcoustics
} // namespace SimulationScheduler
} // namespace ITA
#endif
......
......@@ -12,11 +12,11 @@
namespace ITA
{
namespace simulation_scheduler
namespace SimulationScheduler
{
namespace room_acoustics
namespace RoomAcoustics
{
namespace raven
namespace Raven
{
class CSimulationTask;
class CRavenConfig;
......@@ -74,9 +74,9 @@ namespace ITA
///
static std::unique_ptr<CRIRSimulationResult> ConvertSimulationResult ( std::unique_ptr<CRavenSimulationResult> pResult, CSimulationTask* pTask );
};
} // namespace raven
} // namespace room_acoustics
} // namespace simulation_scheduler
} // namespace Raven
} // namespace RoomAcoustics
} // namespace SimulationScheduler
} // namespace ITA
#endif
......
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