From 40daf6012d7223b0badd14e4557ff050fbb4e2b8 Mon Sep 17 00:00:00 2001 From: Nikolay Pozdnichenko Date: Thu, 14 Nov 2024 17:36:14 +0600 Subject: [PATCH] Fix variance characteristtics names Also fixed some xml comments. --- .../Krab/Calculators/QualityCalculator.cs | 2 +- .../RemotenessKurtosisCoefficientTests.cs | 4 ++-- .../RemotenessKurtosisTests.cs | 4 ++-- .../RemotenessSkewnessCoefficientTests.cs | 4 ++-- .../RemotenessSkewnessTests.cs | 4 ++-- .../RemotenessStandardDeviationTests.cs | 2 +- ...ionTests.cs => RemotenessVarianceTests.cs} | 8 +++---- ...erageRemotenessKurtosisCoefficientTests.cs | 4 ++-- .../AverageRemotenessKurtosisTests.cs | 4 ++-- ...erageRemotenessSkewnessCoefficientTests.cs | 6 ++--- .../AverageRemotenessSkewnessTests.cs | 4 ++-- ...AverageRemotenessStandardDeviationTests.cs | 2 +- ...s.cs => AverageRemotenessVarianceTests.cs} | 8 +++---- .../EntropyKurtosisCoefficientTests.cs | 4 ++-- .../FullCalculators/EntropyKurtosisTests.cs | 6 ++--- .../EntropySkewnessCoefficientTests.cs | 6 ++--- .../FullCalculators/EntropySkewnessTests.cs | 6 ++--- .../EntropyStandardDeviationTests.cs | 3 ++- ...ersionTests.cs => EntropyVarianceTests.cs} | 8 +++---- .../FullCalculatorsFactoryTests.cs | 6 ++--- .../RemotenessKurtosisCoefficientTests.cs | 4 ++-- .../RemotenessKurtosisTests.cs | 4 ++-- .../RemotenessSkewnessCoefficientTests.cs | 4 ++-- .../RemotenessSkewnessTests.cs | 4 ++-- .../RemotenessStandardDeviationTests.cs | 2 +- ...ionTests.cs => RemotenessVarianceTests.cs} | 8 +++---- .../IAccordanceCalculator.cs | 2 +- .../CongenericCalculators/ArithmeticMean.cs | 2 +- .../AverageRemoteness.cs | 2 +- .../CongenericCalculatorsFactory.cs | 2 +- .../CongenericCharacteristic.cs | 6 ++--- .../CuttingLengthVocabularyEntropy.cs | 10 ++++---- .../CongenericCalculators/Depth.cs | 2 +- .../CongenericCalculators/GeometricMean.cs | 2 +- .../IdentificationInformation.cs | 5 +++- .../InformationAmount.cs | 7 ++++-- .../CongenericCalculators/IntervalsCount.cs | 2 +- .../CongenericCalculators/IntervalsSum.cs | 2 +- .../CongenericCalculators/Periodicity.cs | 2 +- .../RemotenessKurtosis.cs | 4 ++-- .../RemotenessKurtosisCoefficient.cs | 4 ++-- .../RemotenessSkewness.cs | 4 ++-- .../RemotenessSkewnessCoefficient.cs | 4 ++-- .../RemotenessStandardDeviation.cs | 8 +++---- ...essDispersion.cs => RemotenessVariance.cs} | 8 +++---- .../CongenericCalculators/Uniformity.cs | 2 +- .../CongenericCalculators/Volume.cs | 2 +- .../AlphabeticAverageRemoteness.cs | 2 +- .../FullCalculators/AlphabeticDepth.cs | 2 +- .../FullCalculators/ArithmeticMean.cs | 2 +- .../FullCalculators/AverageRemoteness.cs | 2 +- .../AverageRemotenessATSkew.cs | 2 +- .../AverageRemotenessGCRatio.cs | 2 +- .../AverageRemotenessGCSkew.cs | 2 +- .../AverageRemotenessGCToATRatio.cs | 2 +- .../AverageRemotenessKurtosis.cs | 6 ++--- .../AverageRemotenessKurtosisCoefficient.cs | 6 ++--- .../AverageRemotenessMKSkew.cs | 2 +- .../AverageRemotenessRYSkew.cs | 2 +- .../AverageRemotenessSWSkew.cs | 2 +- .../AverageRemotenessSkewness.cs | 6 ++--- .../AverageRemotenessSkewnessCoefficient.cs | 8 +++---- .../AverageRemotenessStandardDeviation.cs | 10 ++++---- ...ersion.cs => AverageRemotenessVariance.cs} | 8 +++---- .../Calculators/FullCalculators/Depth.cs | 2 +- .../FullCalculators/DescriptiveInformation.cs | 5 +++- .../FullCalculators/EntropyKurtosis.cs | 9 ++++--- .../EntropyKurtosisCoefficient.cs | 9 ++++--- .../FullCalculators/EntropySkewness.cs | 9 ++++--- .../EntropySkewnessCoefficient.cs | 11 +++++---- .../EntropyStandardDeviation.cs | 13 ++++++---- ...ntropyDispersion.cs => EntropyVariance.cs} | 11 +++++---- .../FullCalculators/FullCalculatorsFactory.cs | 6 ++--- .../FullCalculators/FullCharacteristic.cs | 24 +++++++++---------- .../FullCalculators/GeometricMean.cs | 2 +- .../IdentificationInformation.cs | 5 +++- .../FullCalculators/InformationAmount.cs | 7 ++++-- .../FullCalculators/IntervalsCount.cs | 2 +- .../FullCalculators/IntervalsSum.cs | 2 +- .../FullCalculators/Periodicity.cs | 3 +-- .../Calculators/FullCalculators/Regularity.cs | 2 +- .../FullCalculators/RemotenessKurtosis.cs | 6 ++--- .../RemotenessKurtosisCoefficient.cs | 6 ++--- .../FullCalculators/RemotenessSkewness.cs | 6 ++--- .../RemotenessSkewnessCoefficient.cs | 6 ++--- .../RemotenessStandardDeviation.cs | 10 ++++---- ...essDispersion.cs => RemotenessVariance.cs} | 8 +++---- .../Calculators/FullCalculators/Uniformity.cs | 2 +- .../Calculators/FullCalculators/Volume.cs | 2 +- .../Model/Criterion/CriterionPartialOrlov.cs | 8 +++---- .../Model/Seekers/ProbabilityExtractor.cs | 2 +- 91 files changed, 239 insertions(+), 208 deletions(-) rename Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/{RemotenessDispersionTests.cs => RemotenessVarianceTests.cs} (76%) rename Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/{AverageRemotenessDispersionTests.cs => AverageRemotenessVarianceTests.cs} (88%) rename Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/{EntropyDispersionTests.cs => EntropyVarianceTests.cs} (92%) rename Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/{RemotenessDispersionTests.cs => RemotenessVarianceTests.cs} (92%) rename Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/{RemotenessDispersion.cs => RemotenessVariance.cs} (86%) rename Libiada.Core/Core/Characteristics/Calculators/FullCalculators/{AverageRemotenessDispersion.cs => AverageRemotenessVariance.cs} (83%) rename Libiada.Core/Core/Characteristics/Calculators/FullCalculators/{EntropyDispersion.cs => EntropyVariance.cs} (76%) rename Libiada.Core/Core/Characteristics/Calculators/FullCalculators/{RemotenessDispersion.cs => RemotenessVariance.cs} (86%) diff --git a/Libiada.Clusterizator/Krab/Calculators/QualityCalculator.cs b/Libiada.Clusterizator/Krab/Calculators/QualityCalculator.cs index bb81bca6..173b9805 100644 --- a/Libiada.Clusterizator/Krab/Calculators/QualityCalculator.cs +++ b/Libiada.Clusterizator/Krab/Calculators/QualityCalculator.cs @@ -6,7 +6,7 @@ namespace Libiada.Clusterizator.Krab.Calculators; public static class QualityCalculator { /// - /// The calculate. + /// Quality calculation method. /// /// /// The current graph. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficientTests.cs index 6f44fcc1..6f179342 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficientTests.cs @@ -10,13 +10,13 @@ public class RemotenessKurtosisCoefficientTests : CongenericCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness kurtosis coefficient test. /// /// /// The congeneric sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisTests.cs index eb6267c5..3b5786f4 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisTests.cs @@ -10,13 +10,13 @@ public class RemotenessKurtosisTests : CongenericCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness kurtosis test. /// /// /// The congeneric sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficientTests.cs index 9b72fbdf..62ad5024 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficientTests.cs @@ -10,13 +10,13 @@ public class RemotenessSkewnessCoefficientTests : CongenericCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness skewness coefficient test. /// /// /// The congeneric sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessTests.cs index ef679dec..3f36fc29 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessTests.cs @@ -10,13 +10,13 @@ public class RemotenessSkewnessTests : CongenericCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness skewness test. /// /// /// The congeneric sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviationTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviationTests.cs index 392688c9..8709766e 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviationTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviationTests.cs @@ -16,7 +16,7 @@ public class RemotenessStandardDeviationTests : CongenericCalculatorsTests. /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessDispersionTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessVarianceTests.cs similarity index 76% rename from Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessDispersionTests.cs rename to Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessVarianceTests.cs index cce1a6aa..252ece08 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessDispersionTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/CongenericCalculators/RemotenessVarianceTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.CongenericCalculators; /// -/// The remoteness dispersion tests. +/// The remoteness variance tests. /// [TestFixture] -public class RemotenessDispersionTests : CongenericCalculatorsTests +public class RemotenessVarianceTests : CongenericCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness variance test. /// /// /// The congeneric sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficientTests.cs index 2de3b531..07b798ff 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficientTests.cs @@ -10,13 +10,13 @@ public class AverageRemotenessKurtosisCoefficientTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The average remoteness kurtosis coefficient test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisTests.cs index 966b13d3..ea11d339 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisTests.cs @@ -10,13 +10,13 @@ public class AverageRemotenessKurtosisTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The average remoteness kurtosis test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficientTests.cs index d4586489..d71629d3 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficientTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness asymmetry test. +/// The average remoteness asymmetry coefficient test. /// [TestFixture] public class AverageRemotenessSkewnessCoefficientTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The average remoteness asymmetry coefficient test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessTests.cs index 5478e02e..5c839f14 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessTests.cs @@ -10,13 +10,13 @@ public class AverageRemotenessSkewnessTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The average remoteness asymmetry test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviationTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviationTests.cs index ea56c909..8dd87014 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviationTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviationTests.cs @@ -16,7 +16,7 @@ public class AverageRemotenessStandardDeviationTests : FullCalculatorsTests. /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessDispersionTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessVarianceTests.cs similarity index 88% rename from Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessDispersionTests.cs rename to Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessVarianceTests.cs index 1a8b92a4..901679ae 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessDispersionTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessVarianceTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness dispersion test. +/// The average remoteness variance test. /// [TestFixture] -public class AverageRemotenessDispersionTests : FullCalculatorsTests +public class AverageRemotenessVarianceTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The average remoteness variance test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficientTests.cs index b0884f9c..dfd06fb8 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficientTests.cs @@ -10,13 +10,13 @@ public class EntropyKurtosisCoefficientTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The entropy kurtosis coefficient test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisTests.cs index cc6ea130..d4491302 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness kurtosis tests. +/// The entropy kurtosis tests. /// [TestFixture] public class EntropyKurtosisTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The entropy kurtosis test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficientTests.cs index de6e82f4..0347363e 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficientTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness asymmetry test. +/// The entropy asymmetry coefficient test. /// [TestFixture] public class EntropySkewnessCoefficientTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The entropy asymmetry coefficient test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessTests.cs index a1e4bcfc..cd2f5544 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness asymmetry test. +/// The entropy asymmetry test. /// [TestFixture] public class EntropySkewnessTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The entropy asymmetry test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviationTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviationTests.cs index 5d84bb83..559b8aae 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviationTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviationTests.cs @@ -2,6 +2,7 @@ using Libiada.Core.Core; using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; +using Libiada.Core.Core.SimpleTypes; /// /// Standard Deviation test. @@ -16,7 +17,7 @@ public class EntropyStandardDeviationTests : FullCalculatorsTests. /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyDispersionTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyVarianceTests.cs similarity index 92% rename from Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyDispersionTests.cs rename to Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyVarianceTests.cs index b92707a0..3f2f0f7a 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyDispersionTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/EntropyVarianceTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness dispersion test. +/// The entropy variance test. /// [TestFixture] -public class EntropyDispersionTests : FullCalculatorsTests +public class EntropyVarianceTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The entropy variance test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactoryTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactoryTests.cs index 24400168..81d7eb11 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactoryTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactoryTests.cs @@ -26,7 +26,7 @@ public class FullCalculatorsFactoryTests [TestCase(FullCharacteristic.ATSkew, typeof(ATSkew))] [TestCase(FullCharacteristic.AverageRemoteness, typeof(AverageRemoteness))] [TestCase(FullCharacteristic.AverageRemotenessATSkew, typeof(AverageRemotenessATSkew))] - [TestCase(FullCharacteristic.AverageRemotenessDispersion, typeof(AverageRemotenessDispersion))] + [TestCase(FullCharacteristic.AverageRemotenessVariance, typeof(AverageRemotenessVariance))] [TestCase(FullCharacteristic.AverageRemotenessGCRatio, typeof(AverageRemotenessGCRatio))] [TestCase(FullCharacteristic.AverageRemotenessGCSkew, typeof(AverageRemotenessGCSkew))] [TestCase(FullCharacteristic.AverageRemotenessGCToATRatio, typeof(AverageRemotenessGCToATRatio))] @@ -44,7 +44,7 @@ public class FullCalculatorsFactoryTests [TestCase(FullCharacteristic.Depth, typeof(Depth))] [TestCase(FullCharacteristic.DescriptiveInformation, typeof(DescriptiveInformation))] [TestCase(FullCharacteristic.ElementsCount, typeof(ElementsCount))] - [TestCase(FullCharacteristic.EntropyDispersion, typeof(EntropyDispersion))] + [TestCase(FullCharacteristic.EntropyVariance, typeof(EntropyVariance))] [TestCase(FullCharacteristic.EntropyKurtosis, typeof(EntropyKurtosis))] [TestCase(FullCharacteristic.EntropyKurtosisCoefficient, typeof(EntropyKurtosisCoefficient))] [TestCase(FullCharacteristic.EntropySkewness, typeof(EntropySkewness))] @@ -62,7 +62,7 @@ public class FullCalculatorsFactoryTests [TestCase(FullCharacteristic.Periodicity, typeof(Periodicity))] [TestCase(FullCharacteristic.Probability, typeof(Probability))] [TestCase(FullCharacteristic.Regularity, typeof(Regularity))] - [TestCase(FullCharacteristic.RemotenessDispersion, typeof(RemotenessDispersion))] + [TestCase(FullCharacteristic.RemotenessVariance, typeof(RemotenessVariance))] [TestCase(FullCharacteristic.RemotenessKurtosis, typeof(RemotenessKurtosis))] [TestCase(FullCharacteristic.RemotenessKurtosisCoefficient, typeof(RemotenessKurtosisCoefficient))] [TestCase(FullCharacteristic.RemotenessSkewness, typeof(RemotenessSkewness))] diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficientTests.cs index 96789a21..bdaea4ca 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficientTests.cs @@ -10,13 +10,13 @@ public class RemotenessKurtosisCoefficientTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness kurtosis coefficient test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisTests.cs index d4e85a86..8db3d2bb 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisTests.cs @@ -10,13 +10,13 @@ public class RemotenessKurtosisTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness kurtosis test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficientTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficientTests.cs index f58200f7..010dde16 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficientTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficientTests.cs @@ -10,13 +10,13 @@ public class RemotenessSkewnessCoefficientTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness skewness coefficient test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessTests.cs index f46c69de..5ec71916 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessTests.cs @@ -10,13 +10,13 @@ public class RemotenessSkewnessTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness skewness test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviationTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviationTests.cs index f45736f8..5208b1a4 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviationTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviationTests.cs @@ -16,7 +16,7 @@ public class RemotenessStandardDeviationTests : FullCalculatorsTests. /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessDispersionTests.cs b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessVarianceTests.cs similarity index 92% rename from Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessDispersionTests.cs rename to Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessVarianceTests.cs index c8dceed5..fac98f40 100644 --- a/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessDispersionTests.cs +++ b/Libiada.Core.Tests/Core/Characteristics/Calculators/FullCalculators/RemotenessVarianceTests.cs @@ -4,19 +4,19 @@ using Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The remoteness dispersion tests. +/// The remoteness variance tests. /// [TestFixture] -public class RemotenessDispersionTests : FullCalculatorsTests +public class RemotenessVarianceTests : FullCalculatorsTests { /// - /// The average remoteness dispersion test. + /// The remoteness variance test. /// /// /// Full sequence index in . /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// The value. diff --git a/Libiada.Core/Core/Characteristics/Calculators/AccordanceCalculators/IAccordanceCalculator.cs b/Libiada.Core/Core/Characteristics/Calculators/AccordanceCalculators/IAccordanceCalculator.cs index ecec6c71..bb2f1081 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/AccordanceCalculators/IAccordanceCalculator.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/AccordanceCalculators/IAccordanceCalculator.cs @@ -6,7 +6,7 @@ public interface IAccordanceCalculator { /// - /// The calculate. + /// Calculation method. /// /// /// The first chain. diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/ArithmeticMean.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/ArithmeticMean.cs index c956583a..3e90f015 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/ArithmeticMean.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/ArithmeticMean.cs @@ -14,7 +14,7 @@ public class ArithmeticMean : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// value of average arithmetic of intervals lengths. diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/AverageRemoteness.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/AverageRemoteness.cs index 682b1e00..8a6189df 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/AverageRemoteness.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/AverageRemoteness.cs @@ -13,7 +13,7 @@ public class AverageRemoteness : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Average remoteness value. diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCalculatorsFactory.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCalculatorsFactory.cs index bfa66790..a4998756 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCalculatorsFactory.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCalculatorsFactory.cs @@ -39,7 +39,7 @@ public static ICongenericCalculator CreateCalculator(CongenericCharacteristic ty CongenericCharacteristic.Uniformity => new Uniformity(), CongenericCharacteristic.VariationsCount => new VariationsCount(), CongenericCharacteristic.Volume => new Volume(), - CongenericCharacteristic.RemotenessDispersion => new RemotenessDispersion(), + CongenericCharacteristic.RemotenessVariance => new RemotenessVariance(), CongenericCharacteristic.RemotenessKurtosis => new RemotenessKurtosis(), CongenericCharacteristic.RemotenessKurtosisCoefficient => new RemotenessKurtosisCoefficient(), CongenericCharacteristic.RemotenessSkewness => new RemotenessSkewness(), diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCharacteristic.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCharacteristic.cs index ccbebdcb..d22f5ed8 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCharacteristic.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CongenericCharacteristic.cs @@ -121,11 +121,11 @@ public enum CongenericCharacteristic : byte Volume = 18, /// - /// The remoteness dispersion. + /// The remoteness variance. /// - [Display(Name = "Remoteness dispersion")] + [Display(Name = "Remoteness variance")] [Description("")] - RemotenessDispersion = 19, + RemotenessVariance = 19, /// /// The remoteness kurtosis. diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CuttingLengthVocabularyEntropy.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CuttingLengthVocabularyEntropy.cs index fd5d589a..f73d518e 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CuttingLengthVocabularyEntropy.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/CuttingLengthVocabularyEntropy.cs @@ -3,7 +3,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.CongenericCalculators; /// /// Sadovsky entropy of dictionary. /// -public class CuttingLengthVocabularyEntropy : ICongenericCalculator +public class CuttingLengthVocabularyEntropy : NonLinkableCongenericCalculator { /// /// Calculation method. @@ -11,16 +11,14 @@ public class CuttingLengthVocabularyEntropy : ICongenericCalculator /// /// Source sequence. /// - /// - /// Redundant parameter, not used in calculations. - /// /// /// Cut length vocabulary entropy as . /// - public double Calculate(CongenericChain chain, Link link) + public override double Calculate(CongenericChain chain) { - double cuttingLength = new CuttingLength().Calculate(chain, link); + double cuttingLength = new CuttingLength().Calculate(chain); return Math.Log(chain.Length - cuttingLength + 1, 2); } + } diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Depth.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Depth.cs index e5f0aeb7..77cc9837 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Depth.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Depth.cs @@ -16,7 +16,7 @@ public class Depth : ICongenericCalculator /// Congeneric sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// value of depth. diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/GeometricMean.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/GeometricMean.cs index 36b5a7fb..94c9ac5c 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/GeometricMean.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/GeometricMean.cs @@ -12,7 +12,7 @@ public class GeometricMean : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Average geometric of intervals lengths as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IdentificationInformation.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IdentificationInformation.cs index 41161d49..129703d2 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IdentificationInformation.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IdentificationInformation.cs @@ -11,12 +11,15 @@ public class IdentificationInformation : ICongenericCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval + /// instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Count of identification informations as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/InformationAmount.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/InformationAmount.cs index faef6529..baa39a79 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/InformationAmount.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/InformationAmount.cs @@ -7,13 +7,16 @@ public class InformationAmount : ICongenericCalculator { /// - /// The calculate. + /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency and count + /// based on geometric mean interval formula. /// /// /// The chain. /// /// - /// The link. + /// Binding of the intervals in the sequence. /// /// /// The . diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsCount.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsCount.cs index 3d82b576..35b1154b 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsCount.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsCount.cs @@ -14,7 +14,7 @@ public class IntervalsCount : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Intervals count in chain as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsSum.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsSum.cs index 219ff02c..bfb24985 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsSum.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/IntervalsSum.cs @@ -12,7 +12,7 @@ public class IntervalsSum : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Intervals sum as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Periodicity.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Periodicity.cs index 3630c23c..c0803a44 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Periodicity.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Periodicity.cs @@ -13,7 +13,7 @@ public class Periodicity : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Periodicity as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosis.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosis.cs index f3f1f3ba..fb00ce53 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosis.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosis.cs @@ -12,10 +12,10 @@ public class RemotenessKurtosis : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Remoteness kurtosis value. /// public double Calculate(CongenericChain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficient.cs index fc689476..dee3c45b 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessKurtosisCoefficient.cs @@ -12,10 +12,10 @@ public class RemotenessKurtosisCoefficient : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Remoteness kurtosis coefficient value. /// public double Calculate(CongenericChain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewness.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewness.cs index 3b7dca47..daaa2549 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewness.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewness.cs @@ -12,10 +12,10 @@ public class RemotenessSkewness : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Remoteness skewness value. /// public double Calculate(CongenericChain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficient.cs index f0966bdb..d768766f 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessSkewnessCoefficient.cs @@ -12,10 +12,10 @@ public class RemotenessSkewnessCoefficient : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Remoteness skewness coefficient value. /// public double Calculate(CongenericChain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviation.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviation.cs index 134e580b..705c4617 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviation.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessStandardDeviation.cs @@ -12,15 +12,15 @@ public class RemotenessStandardDeviation : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Remoteness standard deviation value. /// public double Calculate(CongenericChain chain, Link link) { - double remotenessDispersion = new RemotenessDispersion().Calculate(chain, link); + double remotenessVariance = new RemotenessVariance().Calculate(chain, link); - return Math.Sqrt(remotenessDispersion); + return Math.Sqrt(remotenessVariance); } } diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessDispersion.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessVariance.cs similarity index 86% rename from Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessDispersion.cs rename to Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessVariance.cs index a6c8813e..0e1d95e2 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessDispersion.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/RemotenessVariance.cs @@ -1,9 +1,9 @@ namespace Libiada.Core.Core.Characteristics.Calculators.CongenericCalculators; /// -/// The remoteness dispersion. +/// The remoteness variance. /// -public class RemotenessDispersion : ICongenericCalculator +public class RemotenessVariance : ICongenericCalculator { /// /// Calculation method. @@ -12,10 +12,10 @@ public class RemotenessDispersion : ICongenericCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Remoteness variance value. /// public double Calculate(CongenericChain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Uniformity.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Uniformity.cs index 5454031d..558e4205 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Uniformity.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Uniformity.cs @@ -13,7 +13,7 @@ public class Uniformity : ICongenericCalculator /// The congeneric chain. /// /// - /// The link. + /// Binding of the intervals in the sequence. /// /// /// The . diff --git a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Volume.cs b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Volume.cs index f72254ea..3ce9d10f 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Volume.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/CongenericCalculators/Volume.cs @@ -14,7 +14,7 @@ public class Volume : ICongenericCalculator /// Source sequence. /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// Volume characteristic of chain as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticAverageRemoteness.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticAverageRemoteness.cs index 45d40cd7..f69393d4 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticAverageRemoteness.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticAverageRemoteness.cs @@ -12,7 +12,7 @@ public class AlphabeticAverageRemoteness : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticDepth.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticDepth.cs index 0b35920b..7de110fa 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticDepth.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AlphabeticDepth.cs @@ -12,7 +12,7 @@ public class AlphabeticDepth : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// value of alphabetic average remoteness. diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/ArithmeticMean.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/ArithmeticMean.cs index ae9de244..470ae4d7 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/ArithmeticMean.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/ArithmeticMean.cs @@ -14,7 +14,7 @@ public class ArithmeticMean : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// value of average arithmetic of intervals lengths. diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemoteness.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemoteness.cs index ee9c12b7..23b87251 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemoteness.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemoteness.cs @@ -13,7 +13,7 @@ public class AverageRemoteness : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Average remoteness value. diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessATSkew.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessATSkew.cs index ceb970a6..7d3226bb 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessATSkew.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessATSkew.cs @@ -15,7 +15,7 @@ public class AverageRemotenessATSkew : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// AT skew value as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCRatio.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCRatio.cs index e996ebae..2fa7eded 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCRatio.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCRatio.cs @@ -15,7 +15,7 @@ public class AverageRemotenessGCRatio : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// G+C Ratio value as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCSkew.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCSkew.cs index d634c35a..51788495 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCSkew.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCSkew.cs @@ -15,7 +15,7 @@ public class AverageRemotenessGCSkew : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// G+C skew value as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCToATRatio.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCToATRatio.cs index 3bd02775..b4484447 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCToATRatio.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessGCToATRatio.cs @@ -15,7 +15,7 @@ public class AverageRemotenessGCToATRatio : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// G+C Ratio value as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosis.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosis.cs index cc73b503..8828fab3 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosis.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosis.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness kurtosis. +/// Kurtosis of average remotenesses in congeneric sequences. /// public class AverageRemotenessKurtosis : IFullCalculator { @@ -12,10 +12,10 @@ public class AverageRemotenessKurtosis : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Average remoteness kurtosis value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficient.cs index 38f398d6..b045cbf4 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessKurtosisCoefficient.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The average remoteness kurtosis coefficient. +/// Kurtosis coefficient of average remotenesses in congeneric sequences. /// public class AverageRemotenessKurtosisCoefficient : IFullCalculator { @@ -12,10 +12,10 @@ public class AverageRemotenessKurtosisCoefficient : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Average remoteness kurtosis coefficient value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessMKSkew.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessMKSkew.cs index d28d02e9..902a830e 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessMKSkew.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessMKSkew.cs @@ -15,7 +15,7 @@ public class AverageRemotenessMKSkew : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// MK skew value as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessRYSkew.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessRYSkew.cs index 621a97fb..d5e078a9 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessRYSkew.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessRYSkew.cs @@ -15,7 +15,7 @@ public class AverageRemotenessRYSkew : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// RY skew value as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSWSkew.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSWSkew.cs index 6d003598..a57feeef 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSWSkew.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSWSkew.cs @@ -15,7 +15,7 @@ public class AverageRemotenessSWSkew : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// SW skew value as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewness.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewness.cs index f2bf3578..8edb3d2f 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewness.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewness.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Asymmetry of average remoteness. Third central moment. +/// Asymmetry of average remotenesses in congeneric sequences. Third central moment. /// public class AverageRemotenessSkewness : IFullCalculator { @@ -12,10 +12,10 @@ public class AverageRemotenessSkewness : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Average remoteness skewness value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficient.cs index 06fa53f7..50732dd4 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessSkewnessCoefficient.cs @@ -1,8 +1,8 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Normalized asymmetry of average remoteness -/// in other words asymmetry coefficient (skewness) of average remoteness. +/// Normalized asymmetry of average remotenesses in congeneric sequences. +/// in other words asymmetry coefficient (skewness) of average remotenesses. /// public class AverageRemotenessSkewnessCoefficient : IFullCalculator { @@ -13,10 +13,10 @@ public class AverageRemotenessSkewnessCoefficient : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Average remoteness skewness coefficient value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviation.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviation.cs index d5bc85d6..9835ecb1 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviation.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessStandardDeviation.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Standard deviation of average remoteness (square root of dispersion of average remoteness). +/// Standard deviation of average remoteness in congeneric sequernces (square root of variance of average remoteness). /// public class AverageRemotenessStandardDeviation : IFullCalculator { @@ -12,15 +12,15 @@ public class AverageRemotenessStandardDeviation : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Average remoteness standard Deviation value. /// public double Calculate(Chain chain, Link link) { - double averageRemotenessDispersion = new AverageRemotenessDispersion().Calculate(chain, link); + double averageRemotenessVariance = new AverageRemotenessVariance().Calculate(chain, link); - return Math.Sqrt(averageRemotenessDispersion); + return Math.Sqrt(averageRemotenessVariance); } } diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessDispersion.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessVariance.cs similarity index 83% rename from Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessDispersion.cs rename to Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessVariance.cs index b2d49dd6..0995ac4c 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessDispersion.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/AverageRemotenessVariance.cs @@ -1,9 +1,9 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Dispersion of average remoteness. +/// Variance of average remoteness in congeneric sequences. /// -public class AverageRemotenessDispersion : IFullCalculator +public class AverageRemotenessVariance : IFullCalculator { /// /// Calculation method. @@ -12,10 +12,10 @@ public class AverageRemotenessDispersion : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Average remoteness variance value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Depth.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Depth.cs index 3888ce33..a9908d5b 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Depth.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Depth.cs @@ -14,7 +14,7 @@ public class Depth : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Average remoteness value. diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/DescriptiveInformation.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/DescriptiveInformation.cs index f764d25e..f9325e07 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/DescriptiveInformation.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/DescriptiveInformation.cs @@ -7,12 +7,15 @@ public class DescriptiveInformation : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Count of descriptive informations as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosis.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosis.cs index 5146bda3..d4df171b 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosis.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosis.cs @@ -1,21 +1,24 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The entropy kurtosis. +/// Kurtosis of the entropy in congeneric sequences. /// public class EntropyKurtosis : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Entropy Kurtosis value. + /// Entropy kurtosis value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficient.cs index 3eab7150..c4b27a46 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyKurtosisCoefficient.cs @@ -1,21 +1,24 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The entropy kurtosis coefficient. +/// Kurtosis coefficient of the entropy in congeneric sequences. /// public class EntropyKurtosisCoefficient : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Entropy kurtosis coefficient value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewness.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewness.cs index 2e84b049..16a30eb6 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewness.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewness.cs @@ -1,21 +1,24 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Asymmetry of average remoteness. Third central moment. +/// Asymmetry of the entropy in congeneric sequences. Third central moment. /// public class EntropySkewness : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Entropy skewness value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficient.cs index b2f6e380..2f7ff975 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropySkewnessCoefficient.cs @@ -1,22 +1,25 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Normalized asymmetry of average remoteness -/// in other words asymmetry coefficient (skewness) of average remoteness. +/// Normalized asymmetry of the entropy in congeneric sequences. +/// In other words asymmetry coefficient (skewness) of entropy. /// public class EntropySkewnessCoefficient : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Entropy skewness coefficient value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviation.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviation.cs index 99f5ef1e..0106c5ed 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviation.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyStandardDeviation.cs @@ -1,26 +1,29 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Standard deviation of average remoteness (square root of dispersion of average remoteness). +/// Standard deviation of the entropy in congeneric sequences (square root of variance of entropy). /// public class EntropyStandardDeviation : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Entropy standard deviation value. /// public double Calculate(Chain chain, Link link) { - double entropyDispersion = new EntropyDispersion().Calculate(chain, link); + double entropyVariance = new EntropyVariance().Calculate(chain, link); - return Math.Sqrt(entropyDispersion); + return Math.Sqrt(entropyVariance); } } diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyDispersion.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyVariance.cs similarity index 76% rename from Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyDispersion.cs rename to Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyVariance.cs index 0b71952d..a4705900 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyDispersion.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/EntropyVariance.cs @@ -1,21 +1,24 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// Entropy of Dispersion. +/// Variance of the entropy in congeneric sequences. /// -public class EntropyDispersion : IFullCalculator +public class EntropyVariance : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Entropy dispersion value. + /// Entropy variance value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactory.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactory.cs index c45dd5e4..433b8b74 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactory.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCalculatorsFactory.cs @@ -30,7 +30,7 @@ public static IFullCalculator CreateCalculator(FullCharacteristic type) FullCharacteristic.ATSkew => new ATSkew(), FullCharacteristic.AverageRemoteness => new AverageRemoteness(), FullCharacteristic.AverageRemotenessATSkew => new AverageRemotenessATSkew(), - FullCharacteristic.AverageRemotenessDispersion => new AverageRemotenessDispersion(), + FullCharacteristic.AverageRemotenessVariance => new AverageRemotenessVariance(), FullCharacteristic.AverageRemotenessGCRatio => new AverageRemotenessGCRatio(), FullCharacteristic.AverageRemotenessGCSkew => new AverageRemotenessGCSkew(), FullCharacteristic.AverageRemotenessGCToATRatio => new AverageRemotenessGCToATRatio(), @@ -48,7 +48,7 @@ public static IFullCalculator CreateCalculator(FullCharacteristic type) FullCharacteristic.Depth => new Depth(), FullCharacteristic.DescriptiveInformation => new DescriptiveInformation(), FullCharacteristic.ElementsCount => new ElementsCount(), - FullCharacteristic.EntropyDispersion => new EntropyDispersion(), + FullCharacteristic.EntropyVariance => new EntropyVariance(), FullCharacteristic.EntropyKurtosis => new EntropyKurtosis(), FullCharacteristic.EntropyKurtosisCoefficient => new EntropyKurtosisCoefficient(), FullCharacteristic.EntropySkewness => new EntropySkewness(), @@ -67,7 +67,7 @@ public static IFullCalculator CreateCalculator(FullCharacteristic type) FullCharacteristic.Periodicity => new Periodicity(), FullCharacteristic.Probability => new Probability(), FullCharacteristic.Regularity => new Regularity(), - FullCharacteristic.RemotenessDispersion => new RemotenessDispersion(), + FullCharacteristic.RemotenessVariance => new RemotenessVariance(), FullCharacteristic.RemotenessKurtosis => new RemotenessKurtosis(), FullCharacteristic.RemotenessKurtosisCoefficient => new RemotenessKurtosisCoefficient(), FullCharacteristic.RemotenessSkewness => new RemotenessSkewness(), diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCharacteristic.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCharacteristic.cs index 03bf63ba..8bf9e90b 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCharacteristic.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/FullCharacteristic.cs @@ -58,11 +58,11 @@ public enum FullCharacteristic : byte AverageRemotenessATSkew = 7, /// - /// The average remoteness dispersion. + /// The average remoteness variance. /// - [Display(Name = "Average remoteness dispersion")] - [Description("Dispersion of remotenesses of congeneric sequences around average remoteness")] - AverageRemotenessDispersion = 8, + [Display(Name = "Average remoteness variance")] + [Description("Variance of remotenesses of congeneric sequences around average remoteness")] + AverageRemotenessVariance = 8, /// /// The average remoteness gc ratio. @@ -184,11 +184,11 @@ public enum FullCharacteristic : byte ElementsCount = 25, /// - /// The entropy dispersion. + /// The entropy variance. /// - [Display(Name = "Entropy dispersion")] - [Description("Dispersion of entropy of congeneric sequences around entropy of complete sequence")] - EntropyDispersion = 26, + [Display(Name = "Entropy variance")] + [Description("Variance of entropy of congeneric sequences around entropy of complete sequence")] + EntropyVariance = 26, /// /// The entropy kurtosis. @@ -310,11 +310,11 @@ public enum FullCharacteristic : byte Regularity = 43, /// - /// The remoteness dispersion. + /// The remoteness variance. /// - [Display(Name = "Remoteness dispersion")] - [Description("Dispersion of lengthes of individual intervals around average remoteness")] - RemotenessDispersion = 44, + [Display(Name = "Remoteness variance")] + [Description("Variance of lengthes of individual intervals around average remoteness")] + RemotenessVariance = 44, /// /// The remoteness kurtosis. diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/GeometricMean.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/GeometricMean.cs index 8f85f1f6..3ac85212 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/GeometricMean.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/GeometricMean.cs @@ -12,7 +12,7 @@ public class GeometricMean : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Average geometric of intervals lengths as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IdentificationInformation.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IdentificationInformation.cs index 9d583774..f1028a5f 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IdentificationInformation.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IdentificationInformation.cs @@ -12,12 +12,15 @@ public class IdentificationInformation : IFullCalculator { /// /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Count of identification informations as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/InformationAmount.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/InformationAmount.cs index c95bb7fb..80334883 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/InformationAmount.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/InformationAmount.cs @@ -7,13 +7,16 @@ public class InformationAmount : IFullCalculator { /// - /// The calculate. + /// Calculation method. + /// Calculated here using arithmetis mean interval and + /// intervals count instead of elements frequency + /// based on geometric mean interval formula. /// /// /// The chain. /// /// - /// The link. + /// Binding of the intervals in the sequence. /// /// /// The . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsCount.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsCount.cs index 07808f5c..fa63352a 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsCount.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsCount.cs @@ -12,7 +12,7 @@ public class IntervalsCount : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Intervals count in chain as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsSum.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsSum.cs index 6656c2de..7c0cae55 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsSum.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/IntervalsSum.cs @@ -12,7 +12,7 @@ public class IntervalsSum : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Intervals sum as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Periodicity.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Periodicity.cs index 4d6e872e..07cd5f25 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Periodicity.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Periodicity.cs @@ -2,7 +2,6 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// /// Periodicity. -/// TODO: check if it makes sense only for congeneric sequences. /// public class Periodicity : IFullCalculator { @@ -13,7 +12,7 @@ public class Periodicity : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Periodicity as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Regularity.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Regularity.cs index 8f3f0ab0..cfffc424 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Regularity.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Regularity.cs @@ -12,7 +12,7 @@ public class Regularity : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// /// Regularity as . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosis.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosis.cs index cfa069e6..cff772f9 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosis.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosis.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The remoteness kurtosis by intervals lengths. +/// Kurtosis of remoteneses by intervals lengths. /// public class RemotenessKurtosis : IFullCalculator { @@ -12,10 +12,10 @@ public class RemotenessKurtosis : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Remoteness kurtosis value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficient.cs index f88f4305..ee35afc2 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessKurtosisCoefficient.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The remoteness kurtosis coefficient by intervals lengths. +/// Kurtosis coefficient of remoteneses by intervals lengths. /// public class RemotenessKurtosisCoefficient : IFullCalculator { @@ -12,10 +12,10 @@ public class RemotenessKurtosisCoefficient : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Remoteneses kurtosis coefficient value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewness.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewness.cs index 09eb685e..fffb0a0b 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewness.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewness.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The remoteness skewness by intervals lengths. +/// Skewness of remoteneses by intervals lengths. /// public class RemotenessSkewness : IFullCalculator { @@ -12,10 +12,10 @@ public class RemotenessSkewness : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Remoteness skewness value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficient.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficient.cs index 4abd50b4..6e0e4c20 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficient.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessSkewnessCoefficient.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The remoteness skewness coefficient by intervals lengths. +/// Skewness coefficient of remoteneses by intervals lengths. /// public class RemotenessSkewnessCoefficient : IFullCalculator { @@ -12,10 +12,10 @@ public class RemotenessSkewnessCoefficient : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Remoteness skewness coefficient value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviation.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviation.cs index 53697a9e..bda62930 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviation.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessStandardDeviation.cs @@ -1,7 +1,7 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The remoteness standard deviation by intervals lengths. +/// Standard deviation of remoteneses by intervals lengths. /// public class RemotenessStandardDeviation : IFullCalculator { @@ -12,15 +12,15 @@ public class RemotenessStandardDeviation : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Standard Deviation value. + /// Remoteness standard deviation value. /// public double Calculate(Chain chain, Link link) { - double remotenessDispersion = new RemotenessDispersion().Calculate(chain, link); + double remotenessVariance = new RemotenessVariance().Calculate(chain, link); - return Math.Sqrt(remotenessDispersion); + return Math.Sqrt(remotenessVariance); } } diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessDispersion.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessVariance.cs similarity index 86% rename from Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessDispersion.cs rename to Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessVariance.cs index 3ae3e1fe..4321c215 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessDispersion.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/RemotenessVariance.cs @@ -1,9 +1,9 @@ namespace Libiada.Core.Core.Characteristics.Calculators.FullCalculators; /// -/// The remoteness dispersion by intervals lengths. +/// Variance of remoteneses by intervals lengths. /// -public class RemotenessDispersion : IFullCalculator +public class RemotenessVariance : IFullCalculator { /// /// Calculation method. @@ -12,10 +12,10 @@ public class RemotenessDispersion : IFullCalculator /// Source sequence. /// /// - /// Link of intervals in sequence. + /// Binding of the intervals in the sequence. /// /// - /// Average remoteness dispersion value. + /// Remoteness variance value. /// public double Calculate(Chain chain, Link link) { diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Uniformity.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Uniformity.cs index d4f350c4..252a0465 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Uniformity.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Uniformity.cs @@ -13,7 +13,7 @@ public class Uniformity : IFullCalculator /// The chain. /// /// - /// The link. + /// Binding of the intervals in the sequence. /// /// /// The . diff --git a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Volume.cs b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Volume.cs index a6b87b20..b30df844 100644 --- a/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Volume.cs +++ b/Libiada.Core/Core/Characteristics/Calculators/FullCalculators/Volume.cs @@ -14,7 +14,7 @@ public class Volume : IFullCalculator /// Source sequence. /// /// - /// Redundant parameter, not used in calculations. + /// Binding of the intervals in the sequence. /// /// /// Volume characteristic of chain as . diff --git a/Libiada.Segmenter/Model/Criterion/CriterionPartialOrlov.cs b/Libiada.Segmenter/Model/Criterion/CriterionPartialOrlov.cs index 9f69ae5a..24547ed7 100644 --- a/Libiada.Segmenter/Model/Criterion/CriterionPartialOrlov.cs +++ b/Libiada.Segmenter/Model/Criterion/CriterionPartialOrlov.cs @@ -115,7 +115,7 @@ public double TheoryFrequency(int rank, double b, double k) } /// - /// The calculate b. + /// B calculation method. /// /// /// The k. @@ -124,7 +124,7 @@ public double TheoryFrequency(int rank, double b, double k) /// The f 1. /// /// - /// The . + /// B value as . /// public double CalculateB(double k, double f1) { @@ -132,7 +132,7 @@ public double CalculateB(double k, double f1) } /// - /// The calculate k. + /// K calculation method. /// /// /// The fact frequency. @@ -141,7 +141,7 @@ public double CalculateB(double k, double f1) /// The length. /// /// - /// The . + /// K value as . /// public double CalculateK(int factFrequency, int length) { diff --git a/Libiada.Segmenter/Model/Seekers/ProbabilityExtractor.cs b/Libiada.Segmenter/Model/Seekers/ProbabilityExtractor.cs index 596faa6d..73ece964 100644 --- a/Libiada.Segmenter/Model/Seekers/ProbabilityExtractor.cs +++ b/Libiada.Segmenter/Model/Seekers/ProbabilityExtractor.cs @@ -50,7 +50,7 @@ public class ProbabilityExtractor : SubwordExtractor } /// - /// The calculate std. + /// std calculation method. /// /// /// The convoluted.