From: Lukáš Jiřiště <jiriste@icpf.cas.cz>
Date: Tue, 2 Jul 2024 13:02:44 +0000 (+0200)
Subject: Fix statistics and improve output
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=e384f089f79607000dd746a1154cffabbaef4e23;p=Uchytilap.git

Fix statistics and improve output
---

diff --git a/Kalibrace.m b/Kalibrace.m
index a5c1146..cb82856 100644
--- a/Kalibrace.m
+++ b/Kalibrace.m
@@ -2,7 +2,7 @@ clear all, close all
 i=1;
 mezvak=0.07;
 cit=50;
-k=50;
+k=10;
 
 Vb=36.81;
 KK=616.26;%612.47
@@ -23,7 +23,7 @@ for i=1:length(fnamecelk)
     vaku=mean(P{i,1}(P{i,1}<0.01));
     P{i,4}(P{i,1}<mezvak)=[];%smazaní evakuace
     P{i,1}(P{i,1}<mezvak)=[];
-    P{i,2}=-P{i,1}(2:end)+P{i,1}(1:end-1); %derivace odhaluje skoky
+    P{i,2}=(-P{i,1}(2:end)+P{i,1}(1:end-1)); %derivace odhaluje skoky
     P{i,3}=P{i,2}./(P{i,1}(1:end-1)/max(P{i,1})); %nomralizace skoku
     minind=find(P{i,3}<min(P{i,3})/cit);%hledání napouštění
     %smazání vakua a napouštění
@@ -180,10 +180,18 @@ for i=1:length(fnamecelk)
     
 end
 for i=1:length(V)
-    Vprum(i)=mean(V{i});
-    printf("Výsledek z měření %s:\n\tV%i = %f mm^3\n\t", fnamecelk{i}, Vznak(i), Vprum(i));
+    Vprum = mean(V{i});
+	dev = (sum((Vprum - V{i}).^2) / length(V{i}))^0.5;
+	[Vprum, dev, ~, dec] = round_deviation(Vprum, dev);
+    printf("Výsledek z %i skoků z měření %s:\n", length(V{i}), fnamecelk{i})
+	printf("\tV%i = (%.*f ± %.*f) mm^3\n", Vznak(i), dec, Vprum, dec, dev);
 end
-V1=mean(Vprum(Vznak==1))
-V2=mean(Vprum(Vznak==2))
-uA1=(sum((V1-[V{Vznak==1}]).^2)/(length([V{Vznak==1}])-1))^0.5
-uA2=(sum((V2-[V{Vznak==2}]).^2)/(length([V{Vznak==2}])-1))^0.5
+V1 = mean([V{Vznak == 1}]);
+V2 = mean([V{Vznak == 2}]);
+dev1 = (sum((V1-[V{Vznak==1}]).^2)/(length([V{Vznak==1}])-1))^0.5;
+dev2 = (sum((V2-[V{Vznak==2}]).^2)/(length([V{Vznak==2}])-1))^0.5;
+[V1, dev1, ~, dec1] = round_deviation(V1, dev1);
+[V2, dev2, ~, dec2] = round_deviation(V2, dev2);
+printf("\nCelková statistika:\n")
+printf("\tV1 = (%.*f ± %.*f) mm^3\n", dec1, V1, dec1, dev1)
+printf("\tV2 = (%.*f ± %.*f) mm^3\n", dec2, V2, dec2, dev2)
diff --git a/round_deviation.m b/round_deviation.m
new file mode 100644
index 0000000..162c869
--- /dev/null
+++ b/round_deviation.m
@@ -0,0 +1,17 @@
+function [value, deviation, significant_digits, decimal_digits] = round_deviation(value, deviation)
+	order = floor(log10(deviation));
+	first_digit = floor(deviation * 10^-order);
+	if ((first_digit == 1) || (first_digit == 2))
+		--order
+	end
+	deviation = ceil(deviation * 10^-order) * 10^order;
+	order = floor(log10(deviation));
+	first_digit = floor(deviation * 10^-order);
+	if ((first_digit == 1) || (first_digit == 2))
+		--order;
+	end
+	value = round(value * 10^-order) * 10^order;
+	significant_digits = floor(log10(value)) - order;
+	decimal_digits = max(-order, 0);
+	++significant_digits;
+end