Commit 15e41411 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen

Merge branch 'develop' of https://git.rwth-aachen.de/ita/ITABase into develop

parents 7d6bcc7d 9f502fd2
......@@ -124,16 +124,16 @@ namespace ITABase
//! A decibel magnitude spectrum with values that have been transformed into logarithmic scale. Values are mostly between -\infinity and 0, but can also exceed.
class CITAThirdOctaveDecibelMagnitudeSpectrum : public CThirdOctaveMagnitudeSpectrum
class CThirdOctaveDecibelMagnitudeSpectrum : public CThirdOctaveMagnitudeSpectrum
{
public:
inline CITAThirdOctaveDecibelMagnitudeSpectrum()
inline CThirdOctaveDecibelMagnitudeSpectrum()
: CThirdOctaveMagnitudeSpectrum()
{
};
virtual ~CITAThirdOctaveDecibelMagnitudeSpectrum() {};
virtual ~CThirdOctaveDecibelMagnitudeSpectrum() {};
inline void SetIdentity()
{
......
......@@ -6,6 +6,7 @@
#include <stdio.h>
using namespace std;
using namespace ITABase;
void test_third_octave_spectrum();
void test_db_to_ration();
......@@ -27,7 +28,7 @@ int main( int, char** )
void test_db_to_ration()
{
CITAThirdOctaveDecibelMagnitudeSpectrum oTOSpectrumConvertToRatio;
CThirdOctaveDecibelMagnitudeSpectrum oTOSpectrumConvertToRatio;
oTOSpectrumConvertToRatio.SetName( "Test unit decibel magnitude spectrum to ratio" );
oTOSpectrumConvertToRatio.SetIdentity();
......@@ -47,7 +48,7 @@ void test_db_to_ration()
void test_ratio_to_db()
{
CITAThirdOctaveFactorMagnitudeSpectrum oTOSpectrumConvertToRatio;
CThirdOctaveFactorMagnitudeSpectrum oTOSpectrumConvertToRatio;
oTOSpectrumConvertToRatio.SetName( "Test unit factor spectrum to db" );
oTOSpectrumConvertToRatio.SetValueUnit( "(gain)" );
oTOSpectrumConvertToRatio.SetZero(); // all zeros
......@@ -71,14 +72,14 @@ void test_ratio_to_db()
void test_third_octave_spectrum()
{
CITAThirdOctaveGainMagnitudeSpectrum oTOSpectrumIdent;
CThirdOctaveGainMagnitudeSpectrum oTOSpectrumIdent;
oTOSpectrumIdent.SetName( "Test unit gain magnitude spectrum" );
oTOSpectrumIdent.SetIdentity();
cout << "Third octave gain magnitude spectrum identity:" << endl;
cout << oTOSpectrumIdent << endl;
CITAThirdOctaveGainMagnitudeSpectrum oTOSpectrumZero;
CThirdOctaveGainMagnitudeSpectrum oTOSpectrumZero;
oTOSpectrumZero.SetName( "Test unit zero spectrum" );
oTOSpectrumZero.SetZero();
......
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