summaryrefslogtreecommitdiff
path: root/reversing_game_mechanics
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2015-08-28 00:29:04 +0200
committerFlorian Jung <flo@windfisch.org>2015-08-28 00:29:04 +0200
commitf13b8a44441206a4f761002ed3adabd129601ba1 (patch)
tree83543b16f1982441f669391667a5e78261b87842 /reversing_game_mechanics
parent38f85429d76bb220580283c638036cbbf67df4df (diff)
use new zoom formula
Diffstat (limited to 'reversing_game_mechanics')
-rw-r--r--reversing_game_mechanics/zoomlevel/README2
-rw-r--r--reversing_game_mechanics/zoomlevel/fit.log46
-rw-r--r--reversing_game_mechanics/zoomlevel/win.size.gnuplot5
3 files changed, 6 insertions, 47 deletions
diff --git a/reversing_game_mechanics/zoomlevel/README b/reversing_game_mechanics/zoomlevel/README
index 7845ea3..a2acc90 100644
--- a/reversing_game_mechanics/zoomlevel/README
+++ b/reversing_game_mechanics/zoomlevel/README
@@ -28,3 +28,5 @@ Result: visible diagonal = 369.399 * sum(sizes)**0.431776
Also, analyze.py tells us that the viewport ratio is 1.7 : 1
+Additionally, if size<70, then the value 70 instead of "size" is used (found
+out by tinkering around manually)
diff --git a/reversing_game_mechanics/zoomlevel/fit.log b/reversing_game_mechanics/zoomlevel/fit.log
deleted file mode 100644
index 10e4639..0000000
--- a/reversing_game_mechanics/zoomlevel/fit.log
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-*******************************************************************************
-Thu Aug 27 21:04:27 2015
-
-
-FIT: data read from "win.size.all.filtered" using 1:2
- format = x:z
- #datapoints = 227
- residuals are weighted equally (unit weight)
-
-function used for fitting: f(x)
-fitted parameters initialized with current variable values
-
-
-
- Iteration 0
- WSSR : 1.99006e+09 delta(WSSR)/WSSR : 0
- delta(WSSR) : 0 limit for stopping : 1e-05
- lambda : 543.709
-
-initial set of free parameter values
-
-a = 1
-b = 1
-
-After 187 iterations the fit converged.
-final sum of squares of residuals : 316175
-rel. change during last iteration : -9.20903e-11
-
-degrees of freedom (FIT_NDF) : 225
-rms of residuals (FIT_STDFIT) = sqrt(WSSR/ndf) : 37.4863
-variance of residuals (reduced chisquare) = WSSR/ndf : 1405.22
-
-Final set of parameters Asymptotic Standard Error
-======================= ==========================
-
-a = 369.399 +/- 4.401 (1.191%)
-b = 0.431776 +/- 0.002383 (0.5519%)
-
-
-correlation matrix of the fit parameters:
-
- a b
-a 1.000
-b -0.998 1.000
diff --git a/reversing_game_mechanics/zoomlevel/win.size.gnuplot b/reversing_game_mechanics/zoomlevel/win.size.gnuplot
index 90886c3..aa5499c 100644
--- a/reversing_game_mechanics/zoomlevel/win.size.gnuplot
+++ b/reversing_game_mechanics/zoomlevel/win.size.gnuplot
@@ -2,7 +2,9 @@ min(a,b)=(a<b)?a:b
max(a,b)=(a>b)?a:b
f(x) = a* x**b
+g(x) = aa* x**bb + cc
fit f(x) "win.size.all.filtered" using 1:2 via a,b
+fit g(x) "win.size.all.filtered" using 1:2 via aa,bb,cc
plot "win.size.1" using 1:2:(min(1,$3/100)) lt rgb "red" pt 2 ps variable, \
"win.size.2" using 1:2:(min(1,$3/100)) lt rgb "blue" pt 2 ps variable, \
@@ -12,5 +14,6 @@ plot "win.size.1" using 1:2:(min(1,$3/100)) lt rgb "red" pt 2 ps variable, \
"win.size.6" using 1:2:(1) lt rgb "orange" pt 2 ps variable, \
x**0.4*460+50 lt rgb "gray", \
x**0.407*460-400 lt rgb "gray", \
- f(x) lt rgb "black"
+ f(x) lt rgb "black", \
+ g(x) lt rgb "black"
pause -1