From ee779e56cb14b98c35f728686609a76ee11cb589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0?= Date: Sun, 11 Nov 2018 11:43:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD?= =?UTF-8?q?=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Signal Generator/Signal/FmSignal.cs | 12 +++--------- Signal Generator/Signal/MultiSignal.cs | 2 -- Signal Generator/Signal/SinusoidalSignal.cs | 10 ++-------- 3 files changed, 5 insertions(+), 19 deletions(-) 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; }