diff --git a/Signal Generator/Signal/FmSignal.cs b/Signal Generator/Signal/FmSignal.cs index 74e4611..c0bcf16 100644 --- a/Signal Generator/Signal/FmSignal.cs +++ b/Signal Generator/Signal/FmSignal.cs @@ -11,16 +11,10 @@ namespace Signal_Generator { public Collection paramsCollection { get; set; } - public string typeToString - { - get { return "FM сигнал"; } - } - - public new string paramsToString - { - get { return paramsToString(paramsCollection); } - } + public string typeToString => "FM сигнал"; + public new string paramsToString => paramsToString(paramsCollection); + public FmSignal(double ampl, double freq, double ampl2) { paramsCollection = new Collection(); diff --git a/Signal Generator/Signal/MultiSignal.cs b/Signal Generator/Signal/MultiSignal.cs index 4f3682f..e9a8e5a 100644 --- a/Signal Generator/Signal/MultiSignal.cs +++ b/Signal Generator/Signal/MultiSignal.cs @@ -43,9 +43,7 @@ namespace Signal_Generator { double summaryAmplitude = 0; foreach (IAnalogSignal item in signals) - { summaryAmplitude += item.currentAmplitude(t); - } return summaryAmplitude; } diff --git a/Signal Generator/Signal/SinusoidalSignal.cs b/Signal Generator/Signal/SinusoidalSignal.cs index 2ac6047..168a64d 100644 --- a/Signal Generator/Signal/SinusoidalSignal.cs +++ b/Signal Generator/Signal/SinusoidalSignal.cs @@ -9,15 +9,9 @@ namespace Signal_Generator { class SinusoidalSignal : AnalogSignalMethods, IAnalogSignal { - public string typeToString - { - get { return "SIN сигнал"; } - } + public string typeToString => "SIN сигнал"; - public new string paramsToString - { - get { return paramsToString(paramsCollection); } - } + public new string paramsToString => paramsToString(paramsCollection); public Collection paramsCollection { get; set; }