Test suite: the enabled-by-default tests pass in gnuplot 5.4

This commit is contained in:
Dima Kogan 2021-02-08 18:19:26 -08:00
parent 0f7f7d342a
commit 27c6b3c6fb
27 changed files with 823 additions and 860 deletions

View File

@ -1,40 +1,32 @@
*AA*
AA*A
A
+ A*A
40 +-+ A
| A
30 +-+ A
*AA* | AAAAA* A
AA*A z20 +-+AA AA A
A | AA* A*A AA
+ A*A | AA*AAA*AA*A
40 |+ A 10 +-+ AAA
| A 0 | A
30 |+ A +-+ A
| AAAAA* A | A
z 20 |+AA AA A | +-
| AA* A*A AA | +-++-+
| AA*AAA*AA*A | ++-+ +-+--
10 |+ AAA |++-+ +-+-
0 |+ A +---- +-+ 1
| A + ----5 ++-+8
| +- A + + ---- +--+.4
| -++--- + 0 --- +--+2
| --+ +--- 1.--0+6
|-++ +--- ++++
+++-- ---
-21.5+--- +- 1
-10.5--- + 0.6
0 +--- + 024
0.5 ++-0.4
1.521.8

View File

@ -1,40 +1,33 @@
***A****A****A****A***A**
* **A**
**A***A*
*A*
*A
*
***A****A****A****A***A** + A
* **A** 40 +-+ ***A***A****A****A***A** A
**A***A* | **A **A****A** *A
*A* 30 +-+ A*A *A** *A
*A | A *AA
* z20 +-+ AA* **A* *A*
+ A | A**A***A****A***A*****A***A****A***A* A
40 |+ **A****A****A****A***A** A 10 | A
| **A **A****A** A +-+ -+---- A
30 |+ A*A *A** *A 0 | -+--+ + ++----+--
| A *AA* +-+ ---+--+ + --++-----
z 20 |+ AA** **A* *A* | ---+--+ ++---++---
| A**A***A***A****A*****A***A****A****A* AA | -+--+-+ -++----+- 1
10 |+ -+---- A | -+--+ + + ----+.8
| ---- +--------- A | ---+--+ -----+.6
0 |+ ---+ + --------- | ---+--+ ---+.-+.4
| ---++ +-+--------- -+------------- ----+
| ----++ + --------- + + -1+ --------- ----+.2
| ---+ + ----- 1 + -0.5 --------- -----+.4
| ---+ --- 0.8 + 0.5 --------- --- -+.6
| ----+ --++ 0.6 ++ 1.5----+--+-+.8
+-+++--------- --- 0.20.4 + +--++
-2 -1.5 ++ +--------- --- 0
-1 + ++ --+------ --- -0.2
-0.5 0 + ++ --------- ---+ -0.4
0.5 1 ++ -+--- --0.8.6
1.5 + +-1+
2

View File

@ -1,41 +1,40 @@
5 +-----------------------------------------------------------------------------------------+
5 ++---------+-----------+----------+----------+----------+-----------+----------+---------*A | + + + + + + + ** |
+ + + + + + + + ** + | *** |
| *** | | ** |
| ** | 4.5 |-+ *** +-|
4.5 ++ *** ++ | ** |
| ** | | ** |
| ** | | *** |
| *** | | ** |
| ** | 4 |-+ *A* +-|
4 ++ *A* ++ | ** |
| *** | | *** |
| *** | | ** |
| *** | 3.5 |-+ *** +-|
3.5 ++ ** ++ | *** |
| *** | | ** |
| *** | | *** |
| *** | | ** |
3 ++ *A* ++ 3 |-+ *A* +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 2.5 |-+ *** +-|
2.5 ++ ** ++ | ** |
| ** | | ** |
| *** | | *** |
| ** | | ** |
2 ++ *A* ++ 2 |-+ *A* +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 1.5 |-+ *** +-|
1.5 ++ *** ++ | *** |
| ** | | ** |
| *** | | *** |
+ ** + + + + + + + + | ** + + + + + + + |
1 A*---------+-----------+----------+----------+----------+-----------+----------+---------++ 1 +-----------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5
Wrote output to |cat Wrote output to |cat

View File

@ -1,40 +1,30 @@
+-------------------------------------------------------------------------------------------+
+--+-----------+----------+-----------+-----------+-----------+----------+-----------+--+ 5 |-++ + + + + + + ++-|
| + + + + + + + + | | |
| | | *|
5 ++ ++ 4 |-+ *A*-|
| | | ** |
| | | ** |
| * 3 |-+ *A +-|
| *| | ** |
| * | | ** |
4 ++ A ++ 2 |-+ *A +-|
| * | | ** |
| * | | ** |
| * | 1 |-+ A +-|
| * | | |
| * | | |
3 ++ A ++ 0 |-+ +-|
| * | | + + + + + + + + |
| ** | +-------------------------------------------------------------------------------------------+
| * | -10 -8 -6 -4 -2 0 2 4
| * |
2 ++ A ++
| * |
| * |
| * |
| * |
| * |
1 ++ A ++
| |
| |
| |
| |
| |
0 ++ ++
| |
| + + + + + + + + |
+--+-----------+----------+-----------+-----------+-----------+----------+-----------+--+
-10 -8 -6 -4 -2 0 2 4

View File

@ -1,40 +1,39 @@
+-------------------------------------------------------------------------------------------+
+--+-----------+------------+-----------+-----------+-----------+------------+-----------+--+ | + + + + + + + + |
| + + + + + + + + | | |
| | 5 |-+ +-|
5 ++ ++ | |
| | | |
| | | |
| * | *|
| *| | * |
| * | 4 |-+ A+-|
4 ++ A ++ | * |
| * | | * |
| * | | * |
| * | | * |
| * | | * |
| * | 3 |-+ A +-|
3 ++ A ++ | * |
| * | | * |
| ** | | * |
| * | | * |
| * | | * |
2 ++ A ++ 2 |-+ A +-|
| * | | * |
| * | | * |
| * | | * |
| * | | * |
| * | | * |
1 ++ A ++ 1 |-+ A +-|
| | | |
| | | |
| | | |
| | | |
| | | |
0 ++ ++ 0 |-+ +-|
| | | |
| + + + + + + + + | | + + + + + + + + |
+--+-----------+------------+-----------+-----------+-----------+------------+-----------+--+ +-------------------------------------------------------------------------------------------+
-10 -8 -6 -4 -2 0 2 4 -10 -8 -6 -4 -2 0 2 4

View File

@ -1,40 +1,39 @@
5 +-----------------------------------------------------------------------------------------+
5 ++---------+-----------+----------+----------+----------+-----------+----------+---------*A | + + + + + + + ** |
+ + + + + + + + ** + | *** |
| *** | | ** |
| ** | 4.5 |-+ *** +-|
4.5 ++ *** ++ | ** |
| ** | | ** |
| ** | | *** |
| *** | | ** |
| ** | 4 |-+ *A* +-|
4 ++ *A* ++ | ** |
| *** | | *** |
| *** | | ** |
| *** | 3.5 |-+ *** +-|
3.5 ++ ** ++ | *** |
| *** | | ** |
| *** | | *** |
| *** | | ** |
3 ++ *A* ++ 3 |-+ *A* +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 2.5 |-+ *** +-|
2.5 ++ ** ++ | ** |
| ** | | ** |
| *** | | *** |
| ** | | ** |
2 ++ *A* ++ 2 |-+ *A* +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 1.5 |-+ *** +-|
1.5 ++ *** ++ | *** |
| ** | | ** |
| *** | | *** |
+ ** + + + + + + + + | ** + + + + + + + |
1 A*---------+-----------+----------+----------+----------+-----------+----------+---------++ 1 +-----------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5

View File

@ -1,40 +1,39 @@
5 +-----------------------------------------------------------------------------------------+
5 ++---------+-----------+----------+----------+----------+-----------+----------+---------** | + + + + + + + ** |
+ + + + + + + + ** + | *** |
| *** | | ** |
| ** | 4.5 |-+ *** +-|
4.5 ++ *** ++ | ** |
| ** | | ** |
| ** | | *** |
| *** | | ** |
| ** | 4 |-+ *** +-|
4 ++ *** ++ | ** |
| *** | | *** |
| *** | | ** |
| *** | 3.5 |-+ *** +-|
3.5 ++ ** ++ | *** |
| *** | | ** |
| *** | | *** |
| *** | | ** |
3 ++ *** ++ 3 |-+ *** +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 2.5 |-+ *** +-|
2.5 ++ ** ++ | ** |
| ** | | ** |
| *** | | *** |
| ** | | ** |
2 ++ *** ++ 2 |-+ *** +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 1.5 |-+ *** +-|
1.5 ++ *** ++ | *** |
| ** | | ** |
| *** | | *** |
+ ** + + + + + + + + | ** + + + + + + + |
1 **---------+-----------+----------+----------+----------+-----------+----------+---------++ 1 +-----------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5

View File

@ -1,40 +1,39 @@
5 +-----------------------------------------------------------------------------------------+
5 ++---------+-----------+----------+----------+----------+-----------+----------+---------+A | + + + + + + + |
+ + + + + + + + + | |
| | | |
| | 4.5 |-+ +-|
4.5 ++ ++ | |
| | | |
| | | |
| | | |
| | 4 |-+ A +-|
4 ++ A ++ | |
| | | |
| | | |
| | 3.5 |-+ +-|
3.5 ++ ++ | |
| | | |
| | | |
| | | |
3 ++ A ++ 3 |-+ A +-|
| | | |
| | | |
| | | |
| | 2.5 |-+ +-|
2.5 ++ ++ | |
| | | |
| | | |
| | | |
2 ++ A ++ 2 |-+ A +-|
| | | |
| | | |
| | | |
| | 1.5 |-+ +-|
1.5 ++ ++ | |
| | | |
| | | |
+ + + + + + + + + | + + + + + + + |
1 A+---------+-----------+----------+----------+----------+-----------+----------+---------++ 1 +-----------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5

View File

@ -37,7 +37,6 @@
0 A*----------------+-----------------+-----------------+-----------------+----------------++ 0 A*----------------+-----------------+-----------------+-----------------+----------------++
1 1.2 1.4 1.6 1.8 2 1 1.2 1.4 1.6 1.8 2
2 ++---------------------+---------------------+----------------------+--------------------*A 2 ++---------------------+---------------------+----------------------+--------------------*A
+ + + + ** + + + + + ** +

View File

@ -37,7 +37,6 @@
0 A*----------------+-----------------+-----------------+-----------------+----------------++ 0 A*----------------+-----------------+-----------------+-----------------+----------------++
1 1.2 1.4 1.6 1.8 2 1 1.2 1.4 1.6 1.8 2
2 ++---------------------+---------------------+----------------------+--------------------*A 2 ++---------------------+---------------------+----------------------+--------------------*A
+ + + + ** + + + + + ** +

View File

@ -1,40 +1,39 @@
5 +-----------------------------------------------------------------------------------------+
5 ++---------+-----------+----------+----------+----------+-----------+----------+---------+A | + + + + + + + |
+ + + + + + + + + | |
| | | |
| | 4.5 |-+ +-|
4.5 ++ ++ | |
| | | |
| | | |
| | | |
| | 4 |-+ A +-|
4 ++ A ++ | |
| | | |
| | | |
| | 3.5 |-+ +-|
3.5 ++ ++ | |
| | | |
| | | |
| | | |
3 ++ A ++ 3 |-+ A +-|
| | | |
| | | |
| | | |
| | 2.5 |-+ +-|
2.5 ++ ++ | |
| | | |
| | | |
| | | |
2 ++ A ++ 2 |-+ A +-|
| | | |
| | | |
| | | |
| | 1.5 |-+ +-|
1.5 ++ ++ | |
| | | |
| | | |
+ + + + + + + + + | + + + + + + + |
1 A+---------+-----------+----------+----------+----------+-----------+----------+---------++ 1 +-----------------------------------------------------------------------------------------+
05:08 05:08 05:09 05:09 05:10 05:10 05:11 05:11 05:12 05:08 05:08 05:09 05:09 05:10 05:10 05:11 05:11 05:12

View File

@ -1,40 +1,39 @@
25 +------------------------------------------------------------------------------------------+
25 ++---------+-----------+----------+-----------+----------+----------+-----------+---------+E | + + + + + + + |
+ + + + + + + + 2 **A*** + | 2 ***A*** |
| 4 ##B### | | 4 ###B### |
| 6 $$C$$$ | | 6 $$$C$$$ |
| 8 %%D%%% | | 8 %%%D%%% |
| 10 @@E@@@ | | 10 @@@E@@@ |
| | 20 |-+ +-|
20 ++ ++ | |
| | | |
| | | |
| | | |
| | | |
| | | D |
| D | 15 |-+ +-|
15 ++ ++ | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
10 ++ ++ 10 |-+ +-|
| C | | C |
| | | |
| | | |
| | | |
| | | |
| | | |
5 ++ ++ 5 |-+ +-|
| B | | B |
| | | |
| | | |
| | | |
| | | |
A + + + + + + + + | + + + + + + + |
0 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++ 0 +------------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5

View File

@ -1,40 +1,39 @@
25 +------------------------------------------------------------------------------------------+
25 ++---------+-----------+----------+-----------+----------+----------+-----------+---------+A | + + + + + + + **|
+ + + + + + + + **+ | ** |
| ** | | ** |
| ** | | * |
| * | | ** |
| ** | | ** |
| ** | 20 |-+ ** +-|
20 ++ ** ++ | ** |
| ** | | * |
| * | | ** |
| ** | | ** |
| ** | | ** |
| ** | | *A |
| *A | 15 |-+ ** +-|
15 ++ ** ++ | ** |
| *** | | ** |
| ** | | ** |
| *** | | *** |
| ** | | ** |
| ** | | ** |
| *** | | ** |
10 ++ ** ++ 10 |-+ ** +-|
| *A* | | *A* |
| *** | | *** |
| **** | | **** |
| *** | | *** |
| *** | | *** |
| **** | | **** |
5 ++ *** ++ 5 |-+ *** +-|
| **A* | | **A* |
| **** | | **** |
| ***** | | ***** |
| ***** | | ***** |
| **** | | **** |
A** + + + + + + + + |** + + + + + + + |
0 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++ 0 +------------------------------------------------------------------------------------------+
2 3 4 5 6 7 8 9 10 2 3 4 5 6 7 8 9 10

View File

@ -1,40 +1,39 @@
5.5 +-----------------------------------------------------------------------------------------+
5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------** | + + + + + + + |
+ + + + + + + + * | |
| * | |
5 ++ +A 5 |-+ +-|
| * | |
| * | |
| * 4.5 |-+ +*|
4.5 ++ ** | *** |
| *** | | * |
| * | | * |
4 ++ A ++ 4 |-+ A +-|
| * | | * |
| * | | * |
| *** | 3.5 |-+ *** +-|
3.5 ++ ++ | |
| *** | | *** |
| * | | * |
3 ++ A ++ 3 |-+ A +-|
| * | | * |
| * | | *** |
| *** | | |
2.5 ++ ++ 2.5 |-+ +-|
| | | |
| *** | | *** |
2 ++ A ++ 2 |-+ A +-|
| * | | * |
| *** | | *** |
| | | |
1.5 ++ ++ 1.5 |-+ +-|
| | | |
| | | |
1 A* ++ 1 |*+ +-|
** | |* |
| | | |
+ + + + + + + + + | + + + + + + + |
0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++ 0.5 +-----------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5

View File

@ -1,40 +1,39 @@
+-------------------------------------------------------------------------------------------+
+-----------+----------+-----------+----------+-----------+----------+-----------+---------** | + + + + + + + |
+ + + + + + + + * | |
| * | |
5 ++ +A 5 |-+ +-|
| * | |
| * | |
| * | *|
| ** | *** |
| *** | | * |
## * | |# * |
4 B# A ++ 4 |#+ A +-|
## * | |# * |
| * | | * |
| *** | | *** |
| | | |
| *** | | *** |
| # # * | | # # * |
3 ++ #########B## A ++ 3 |-+ #########B## A +-|
| # # * | | # # * |
| * | | *** |
| *** | | |
| | | |
| | | |
| *** # # | | *** # # |
2 ++ A ##############B### ++ 2 |-+ A ##############B### +-|
| * # # | | * # # |
| *** | | *** |
| | | |
| | | |
| | | |
| # # | | # # |
1 A* ##################B##### ++ 1 |*+ ##################B##### +-|
** # # | |* # # |
| | | |
+ + + + + + + + + | + + + + + + + |
+-----------+----------+-----------+----------+-----------+----------+-----------+----------+ +-------------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5

View File

@ -1,40 +1,39 @@
5.5 +-----------------------------------------------------------------------------------------+
5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------** | + + + + + + + |
+ + + + + + + + * | |
| * | |
5 ++ +A 5 |-+ +-|
| * | |
| * | |
| * 4.5 |-+ +*|
4.5 ++ ** | *** |
| *** | | * |
| * | | * |
4 ++ A ++ 4 |-+ A +-|
| * | | * |
| * | | * |
| *** | 3.5 |-+ *** +-|
3.5 ++ ++ | |
| *** | | *** |
| * | | * |
3 ++ A ++ 3 |-+ A +-|
| * | | * |
| * | | *** |
| *** | | |
2.5 ++ ++ 2.5 |-+ +-|
| | | |
| *** | | *** |
2 ++ A ++ 2 |-+ A +-|
| * | | * |
| *** | | *** |
| | | |
1.5 ++ ++ 1.5 |-+ +-|
| | | |
| | | |
1 A* ++ 1 |*+ +-|
** | |* |
| | | |
+ + + + + + + + + | + + + + + + + |
0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++ 0.5 +-----------------------------------------------------------------------------------------+
1 1.5 2 2.5 3 3.5 4 4.5 5 1 1.5 2 2.5 3 3.5 4 4.5 5

View File

@ -1,40 +1,38 @@
Test plot Test plot
y2 10 +-------------------------------------------------------------------------------+ 30
10 ++---------+----------+---------+----------+----------+----------+---------+---------** 30 | + + + + + + + ** |
+ + + + + + + data 0 ****** + | data 0 ******* |
| *** | | ** |
| *** | 9 |-+ *** |
9 ++ ** | | ** +-| 25
| *** +G 25 | *** |
| *** | | ** |
| ** | 8 |-+ *** |
8 ++ *** | | ** |
| *** | | *** |
| ** | | ** +-| 20
| *** ++ 20 7 |-+ *** |
7 ++ *** | | ** |
| *** | | *** |
| ** | | ** G |
| *** G | 6 |-+ *** +-| 15
6 ++ *** ++ 15 y | ** | y2
| ** | | ** |
| ** | | ** |
| *** | | *** |
| ** | 5 |-+ ** |
5 ++ ** | | ** +-| 10
| *** ++ 10 | ** G |
| ** G | | ** |
| ** | 4 |-+ *** |
4 ++ *** | | ** |
| *** | | *** +-| 5
| ** ++ 5 | ** |
| *** | 3 |-+ *** G |
3 ++ *** G | | ** |
| *** | | *** |
| ** | | ** + + + + + + + |
G *** + + + + + + + + 2 +-------------------------------------------------------------------------------+ 0
2 **---------+----------+---------+----------+----------+----------+---------+---------++ 0 1 1.5 2 2.5 3 3.5 4 4.5 5
1 1.5 2 2.5 3 3.5 4 4.5 5 x
x

View File

@ -1,40 +1,38 @@
Test plot Test plot
y2 10 +-------------------------------------------------------------------------------+ 30
10 ++---------+----------+---------+----------+----------+----------+---------+---------*A 30 | + + + + + + + ** |
+ + + + + + + data 0 **A*** + | data 0 ***A*** |
| *** | | ** |
| *** | 9 |-+ *** |
9 ++ ** | | ** +#| 25
| *** #B 25 | *** ## |
| *** ## | | ** ## |
| ** ## | 8 |-+ *A* ## |
8 ++ *A* ## | | ** ## |
| *** ## | | *** ## |
| ** ## | | ** ## +-| 20
| *** ## ++ 20 7 |-+ *** ## |
7 ++ *** ## | | ** ## |
| *** ## | | *** ## |
| ** ## | | ** #B |
| *** #B# | 6 |-+ *A* ## +-| 15
6 ++ *A* ### ++ 15 y | ** ### | y2
| ** ## | | ** ## |
| ** ### | | ** ### |
| *** ### | | *** ## |
| ** ### | 5 |-+ ** ### |
5 ++ ** ## | | ** ## +-| 10
| *** ### ++ 10 | ** #B# |
| ** #B# | | ** #### |
| ** #### | 4 |-+ *A* ### |
4 ++ *A* ### | | ** ### |
| *** #### | | *** #### +-| 5
| ** ### ++ 5 | ** ### |
| *** #### | 3 |-+ *** ###B# |
3 ++ *** ###B# | | ** ####### |
| *** ######## | | ###### |
| #**#### | |### + + + + + + + |
B#*** + + + + + + + + 2 +-------------------------------------------------------------------------------+ 0
2 A*---------+----------+---------+----------+----------+----------+---------+---------++ 0 1 1.5 2 2.5 3 3.5 4 4.5 5
1 1.5 2 2.5 3 3.5 4 4.5 5 x
x

View File

@ -1,40 +1,39 @@
10 +-----------------------------------------------------------------------------------------+
10 ++---------+-----------+----------+----------+----------+-----------+----------+---------*A | + + + + + + + ** |
+ + + + + + + + ** + | *** |
| *** | | ** |
| ** | 9.5 |-+ *** +-|
9.5 ++ *** ++ | ** |
| ** | | ** |
| ** | | *** |
| *** | | ** |
| ** | 9 |-+ *A* +-|
9 ++ *A* ++ | ** |
| *** | | *** |
| *** | | ** |
| *** | 8.5 |-+ *** +-|
8.5 ++ ** ++ | *** |
| *** | | ** |
| *** | | *** |
| *** | | ** |
8 ++ *A* ++ 8 |-+ *A* +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 7.5 |-+ *** +-|
7.5 ++ ** ++ | ** |
| ** | | ** |
| *** | | *** |
| ** | | ** |
7 ++ *A* ++ 7 |-+ *A* +-|
| ** | | ** |
| *** | | *** |
| ** | | ** |
| *** | 6.5 |-+ *** +-|
6.5 ++ *** ++ | *** |
| ** | | ** |
| *** | | *** |
+ ** + + + + + + + + | ** + + + + + + + |
6 A*---------+-----------+----------+----------+----------+-----------+----------+---------++ 6 +-----------------------------------------------------------------------------------------+
0 0.5 1 1.5 2 2.5 3 3.5 4 0 0.5 1 1.5 2 2.5 3 3.5 4

105
t/plots.t
View File

@ -3,7 +3,7 @@
# This tests various features of feedgnuplot. Note that the tests look at actual # This tests various features of feedgnuplot. Note that the tests look at actual
# plot output using the 'dumb' terminal, so any changes in gnuplot itself that # plot output using the 'dumb' terminal, so any changes in gnuplot itself that
# change the way the output looks will show up as test failures. Currently the # change the way the output looks will show up as test failures. Currently the
# reference plots come from gnuplot 4.6.4, and I make sure this is the version # reference plots come from gnuplot 5.4, and I make sure this is the version
# we're testing with # we're testing with
# #
# Note that some tests are only executed when the RUN_ALL_TESTS environment # Note that some tests are only executed when the RUN_ALL_TESTS environment
@ -27,14 +27,14 @@ BEGIN {
my $gnuplotVersion = `gnuplot --version`; my $gnuplotVersion = `gnuplot --version`;
if( !$gnuplotVersion || $@) if( !$gnuplotVersion || $@)
{ {
print("1..0 # Skip: gnuplot not installed. Tests require ver. 4.6.4; feedgnuplot works with any.\n"); print("1..0 # Skip: gnuplot not installed. Tests require ver. 5.4; feedgnuplot works with any.\n");
exit(0); exit(0);
} }
chomp $gnuplotVersion; chomp $gnuplotVersion;
if ($gnuplotVersion ne "gnuplot 4.6 patchlevel 4") if ($gnuplotVersion ne "gnuplot 5.4 patchlevel 1")
{ {
print("1..0 # Skip: tests require gnuplot 4.6.4. Instead I detected '$gnuplotVersion'.\n"); print("1..0 # Skip: tests require gnuplot 5.4. Instead I detected '$gnuplotVersion'.\n");
exit(0); exit(0);
} }
} }
@ -49,35 +49,35 @@ use FindBin qw($Bin);
tryplot( testname => 'basic line plot', tryplot( testname => 'basic line plot',
cmd => 'seq 5', cmd => 'seq 5',
options => [qw(--lines --points)], options => [qw(--lines --points)],
refplot => readfile('basic-line-plot.ref') ); refplot => 'basic-line-plot.ref' );
tryplot( testname => 'basic line plot to piped hardcopy', tryplot( testname => 'basic line plot to piped hardcopy',
cmd => 'seq 5', cmd => 'seq 5',
options => [qw(--lines --points), options => [qw(--lines --points),
'--hardcopy', '|cat'], '--hardcopy', '|cat'],
refplot => readfile('basic-line-plot-to-piped-hardcopy.ref') ); refplot => 'basic-line-plot-to-piped-hardcopy.ref' );
tryplot( testname => 'basic lines-only plot', tryplot( testname => 'basic lines-only plot',
cmd => 'seq 5', cmd => 'seq 5',
options => [qw(--lines)], options => [qw(--lines)],
refplot => readfile('basic-lines-only-plot.ref') ); refplot => 'basic-lines-only-plot.ref' );
tryplot( testname => 'basic points-only plot', tryplot( testname => 'basic points-only plot',
cmd => 'seq 5', cmd => 'seq 5',
options => [qw(--points)], options => [qw(--points)],
refplot => readfile('basic-points-only-plot.ref') ); refplot => 'basic-points-only-plot.ref' );
tryplot( testname => 'basic line plot with bounds', tryplot( testname => 'basic line plot with bounds',
cmd => 'seq 5', cmd => 'seq 5',
options => [qw(--lines --points), options => [qw(--lines --points),
qw(--xmin -10.5 --xmax 4.5 --ymin -0.5 --ymax 5.5)], qw(--xmin -10.5 --xmax 4.5 --ymin -0.5 --ymax 5.5)],
refplot => readfile('basic-line-plot-with-bounds.ref') ); refplot => 'basic-line-plot-with-bounds.ref' );
tryplot( testname => 'basic line plot with bounds, square aspect ratio', tryplot( testname => 'basic line plot with bounds, square aspect ratio',
cmd => 'seq 5', cmd => 'seq 5',
options => [qw(--lines --points), options => [qw(--lines --points),
qw(--xmin -10.5 --xmax 4.5 --ymin -0.5 --ymax 5.5 --square)], qw(--xmin -10.5 --xmax 4.5 --ymin -0.5 --ymax 5.5 --square)],
refplot => readfile('basic-line-plot-with-bounds-square-aspect-ratio.ref') ); refplot => 'basic-line-plot-with-bounds-square-aspect-ratio.ref' );
tryplot( testname => 'lines on both axes with labels, legends, titles', tryplot( testname => 'lines on both axes with labels, legends, titles',
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'}, cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
@ -85,7 +85,7 @@ tryplot( testname => 'lines on both axes with labels, legends, titles',
'--legend', '0', 'data 0', '--legend', '0', 'data 0',
'--title', "Test plot", '--title', "Test plot",
qw(--y2 1 --y2label y2 --xlabel x --ylabel y --y2max 30)], qw(--y2 1 --y2label y2 --xlabel x --ylabel y --y2max 30)],
refplot => readfile('lines-on-both-axes-with-labels-legends-titles.ref') ); refplot => 'lines-on-both-axes-with-labels-legends-titles.ref' );
tryplot( testname => 'lines on both axes with labels, legends, titles; different styles', tryplot( testname => 'lines on both axes with labels, legends, titles; different styles',
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'}, cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
@ -94,75 +94,75 @@ tryplot( testname => 'lines on both axes with labels, legends, titles; different
qw(--y2 1 --y2label y2 --xlabel x --ylabel y --y2max 30), qw(--y2 1 --y2label y2 --xlabel x --ylabel y --y2max 30),
'--curvestyle', '0', 'with lines', '--curvestyle', '0', 'with lines',
'--curvestyle', '1', 'with points ps 3 pt 7'], '--curvestyle', '1', 'with points ps 3 pt 7'],
refplot => readfile('lines-on-both-axes-with-labels-legends-titles-different-styles.ref') ); refplot => 'lines-on-both-axes-with-labels-legends-titles-different-styles.ref' );
tryplot( testname => 'domain plot', tryplot( testname => 'domain plot',
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'}, cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
options => [qw(--lines --points), '--domain'], options => [qw(--lines --points), '--domain'],
refplot => readfile('domain-plot.ref') ); refplot => 'domain-plot.ref' );
tryplot( testname => 'dataid plot', tryplot( testname => 'dataid plot',
cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'}, cmd => q{seq 5 | gawk '{print 2*$1, $1*$1}'},
options => [qw(--lines --points), options => [qw(--lines --points),
qw(--dataid --autolegend)], qw(--dataid --autolegend)],
refplot => readfile('dataid-plot.ref') ); refplot => 'dataid-plot.ref' );
tryplot( testname => '3d spiral with bounds, labels', tryplot( testname => '3d spiral with bounds, labels',
cmd => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'}, cmd => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'},
options => [qw(--lines --points), options => [qw(--lines --points),
qw(--3d --domain --zmin -5 --zmax 45 --zlabel z), qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
'--extracmds', 'set view 60,30'], '--extracmds', 'set view 60,30'],
refplot => readfile('3d-spiral-with-bounds-labels.ref') ); refplot => '3d-spiral-with-bounds-labels.ref' );
tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio', tryplot( testname => '3d spiral with bounds, labels, square xy aspect ratio',
cmd => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'}, cmd => q{seq 50 | gawk '{print 2*cos($1/5), sin($1/5), $1}'},
options => [qw(--lines --points), options => [qw(--lines --points),
qw(--3d --domain --zmin -5 --zmax 45 --zlabel z), qw(--3d --domain --zmin -5 --zmax 45 --zlabel z),
'--extracmds', 'set view 60,30', '--square_xy'], '--extracmds', 'set view 60,30', '--square_xy'],
refplot => readfile('3d-spiral-with-bounds-labels-square-xy-aspect-ratio.ref') ); refplot => '3d-spiral-with-bounds-labels-square-xy-aspect-ratio.ref' );
tryplot( testname => 'Monotonicity check', tryplot( testname => 'Monotonicity check',
cmd => q{seq 10 | gawk '{print (NR-1)%5,NR}'}, cmd => q{seq 10 | gawk '{print (NR-1)%5,NR}'},
options => [qw(--lines --points --domain --monotonic)], options => [qw(--lines --points --domain --monotonic)],
refplot => readfile('monotonicity-check.ref') ); refplot => 'monotonicity-check.ref' );
tryplot( testname => 'basic --timefmt plot', tryplot( testname => 'basic --timefmt plot',
cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'}, cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S'], options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S'],
refplot => readfile('basic-timefmt-plot.ref') ); refplot => 'basic-timefmt-plot.ref' );
tryplot( testname => '--timefmt plot with bounds', tryplot( testname => '--timefmt plot with bounds',
cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'}, cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1}'},
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S', options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
'--xmin', '20 Oct 2013 06:05:00', '--xmin', '20 Oct 2013 06:05:00',
'--xmax', '20 Oct 2013 06:05:20'], '--xmax', '20 Oct 2013 06:05:20'],
refplot => readfile('timefmt-plot-with-bounds.ref') ); refplot => 'timefmt-plot-with-bounds.ref' );
tryplot( testname => '--timefmt plot with --monotonic', tryplot( testname => '--timefmt plot with --monotonic',
cmd => q{seq 10 | gawk '{x=(NR-1)%5; print strftime("%d %b %Y %T",1382249107+x,1),$1}'}, cmd => q{seq 10 | gawk '{x=(NR-1)%5; print strftime("%d %b %Y %T",1382249107+x,1),$1}'},
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S', options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
'--monotonic'], '--monotonic'],
refplot => readfile('timefmt-plot-with-monotonic.ref') ); refplot => 'timefmt-plot-with-monotonic.ref' );
tryplot( testname => '--timefmt with custom rangesize', tryplot( testname => '--timefmt with custom rangesize',
cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1,$1/10}'}, cmd => q{seq 5 | gawk '{print strftime("%d %b %Y %T",1382249107+$1,1),$1,$1/10}'},
options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S', options => ['--domain', '--timefmt', '%d %b %Y %H:%M:%S',
qw(--with errorbars --rangesizeall 2)], qw(--with errorbars --rangesizeall 2)],
refplot => readfile('timefmt-with-custom-rangesize.ref') ); refplot => 'timefmt-with-custom-rangesize.ref' );
tryplot( testname => 'Error bars (using extraValuesPerPoint)', tryplot( testname => 'Error bars (using extraValuesPerPoint)',
cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'}, cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'},
options => [qw(--domain), options => [qw(--domain),
qw(--extraValuesPerPoint 1 --with errorbars)], qw(--extraValuesPerPoint 1 --with errorbars)],
refplot => readfile('error-bars-using-extravaluesperpoint.ref') ); refplot => 'error-bars-using-extravaluesperpoint.ref' );
tryplot( testname => 'Error bars (using rangesizeall)', tryplot( testname => 'Error bars (using rangesizeall)',
cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'}, cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'},
options => [qw(--domain), options => [qw(--domain),
qw(--rangesizeall 2 --with errorbars)], qw(--rangesizeall 2 --with errorbars)],
refplot => readfile('error-bars-using-rangesizeall.ref') ); refplot => 'error-bars-using-rangesizeall.ref' );
tryplot( testname => 'Error bars (using rangesize, rangesizeall)', tryplot( testname => 'Error bars (using rangesize, rangesizeall)',
@ -170,7 +170,7 @@ tryplot( testname => 'Error bars (using rangesize, rangesizeall)',
options => [qw(--domain --dataid), options => [qw(--domain --dataid),
qw(--rangesize vert 2 --rangesizeall 3 --with xerrorbars --style vert), 'with errorbars', qw(--rangesize vert 2 --rangesizeall 3 --with xerrorbars --style vert), 'with errorbars',
qw(--xmin 1 --xmax 5 --ymin 0.5 --ymax 5.5)], qw(--xmin 1 --xmax 5 --ymin 0.5 --ymax 5.5)],
refplot => readfile('error-bars-using-rangesize-rangesizeall.ref') ); refplot => 'error-bars-using-rangesize-rangesizeall.ref' );
SKIP: SKIP:
@ -193,18 +193,18 @@ tryplot( testname => 'Histogram plot',
cmd => q{seq 50 | gawk '{print $1*$1}'}, cmd => q{seq 50 | gawk '{print $1*$1}'},
options => [qw(--lines --points), options => [qw(--lines --points),
qw(--histo 0 --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'], qw(--histo 0 --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
refplot => readfile('histogram-plot.ref') ); refplot => 'histogram-plot.ref' );
tryplot( testname => 'Cumulative histogram', tryplot( testname => 'Cumulative histogram',
cmd => q{seq 50 | gawk '{print $1*$1}'}, cmd => q{seq 50 | gawk '{print $1*$1}'},
options => [qw(--lines --points), options => [qw(--lines --points),
qw(--histo 0 --histstyle cum --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'], qw(--histo 0 --histstyle cum --binwidth 50 --ymin 0 --curvestyleall), 'with boxes'],
refplot => readfile('cumulative-histogram.ref') ); refplot => 'cumulative-histogram.ref' );
tryplot( testname => 'Circles', tryplot( testname => 'Circles',
cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'}, cmd => q{seq 5 | gawk '{print $1,$1,$1/10}'},
options => [qw(--circles --domain)], options => [qw(--circles --domain)],
refplot => readfile('circles.ref') ); refplot => 'circles.ref' );
@ -217,37 +217,37 @@ note( "Starting to run streaming tests. These will take several seconds each" );
tryplot( testname => 'basic streaming test', tryplot( testname => 'basic streaming test',
cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 1.2");}'}, cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 1.2");}'},
options => [qw(--lines --points --stream)], options => [qw(--lines --points --stream)],
refplot => readfile('basic-streaming-test.ref') ); refplot => 'basic-streaming-test.ref' );
tryplot( testname => 'basic streaming test, twice as fast', tryplot( testname => 'basic streaming test, twice as fast',
cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'}, cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
options => [qw(--lines --points --stream 0.4)], options => [qw(--lines --points --stream 0.4)],
refplot => readfile('basic-streaming-test-twice-as-fast.ref') ); refplot => 'basic-streaming-test-twice-as-fast.ref' );
tryplot( testname => 'streaming with --xlen', tryplot( testname => 'streaming with --xlen',
cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'}, cmd => q{seq 500 | gawk 'BEGIN{ print 0; } {print (NR==3)? "exit" : $0; fflush(); system("sleep 0.6");}'},
options => [qw(--lines --points --stream 0.4 --xlen 1.1)], options => [qw(--lines --points --stream 0.4 --xlen 1.1)],
refplot => readfile('streaming-with-xlen.ref') ); refplot => 'streaming-with-xlen.ref' );
tryplot( testname => 'streaming with --monotonic', tryplot( testname => 'streaming with --monotonic',
cmd => q{seq 500 | gawk '{if(NR==11) {print "exit";} else {x=(NR-1)%5; if(x==0) {print -1,-1;} print x,NR;}; fflush(); system("sleep 0.6");}'}, cmd => q{seq 500 | gawk '{if(NR==11) {print "exit";} else {x=(NR-1)%5; if(x==0) {print -1,-1;} print x,NR;}; fflush(); system("sleep 0.6");}'},
options => [qw(--lines --points --stream 0.4 --domain --monotonic)], options => [qw(--lines --points --stream 0.4 --domain --monotonic)],
refplot => readfile('streaming-with-monotonic.ref') ); refplot => 'streaming-with-monotonic.ref' );
tryplot( testname => '--timefmt streaming plot with --xlen', tryplot( testname => '--timefmt streaming plot with --xlen',
cmd => q{seq 5 | gawk 'BEGIN{ print strftime("%d %b %Y %T",1382249107-1,1),-4;} {if(NR==3) {print "exit";} else{ print strftime("%d %b %Y %T",1382249107+$1,1),$1;} fflush(); system("sleep 0.6")}'}, cmd => q{seq 5 | gawk 'BEGIN{ print strftime("%d %b %Y %T",1382249107-1,1),-4;} {if(NR==3) {print "exit";} else{ print strftime("%d %b %Y %T",1382249107+$1,1),$1;} fflush(); system("sleep 0.6")}'},
options => ['--points', '--lines', options => ['--points', '--lines',
'--domain', '--timefmt', '%d %b %Y %H:%M:%S', '--domain', '--timefmt', '%d %b %Y %H:%M:%S',
qw(--stream 0.4 --xlen 3)], qw(--stream 0.4 --xlen 3)],
refplot => readfile('timefmt-streaming-plot-with-xlen.ref') ); refplot => 'timefmt-streaming-plot-with-xlen.ref' );
tryplot( testname => '--timefmt streaming plot with --monotonic', tryplot( testname => '--timefmt streaming plot with --monotonic',
cmd => q{seq 10 | gawk '{x=(NR-1)%5; if(x==0) {print strftime("%d %b %Y %T",1382249107-1,-4),-4;} print strftime("%d %b %Y %T",1382249107+x,1),NR; fflush(); system("sleep 0.6")}'}, cmd => q{seq 10 | gawk '{x=(NR-1)%5; if(x==0) {print strftime("%d %b %Y %T",1382249107-1,-4),-4;} print strftime("%d %b %Y %T",1382249107+x,1),NR; fflush(); system("sleep 0.6")}'},
options => ['--points', '--lines', options => ['--points', '--lines',
'--domain', '--timefmt', '%d %b %Y %H:%M:%S', '--domain', '--timefmt', '%d %b %Y %H:%M:%S',
qw(--stream 0.4 --monotonic)], qw(--stream 0.4 --monotonic)],
refplot => readfile('timefmt-streaming-plot-with-monotonic.ref') ); refplot => 'timefmt-streaming-plot-with-monotonic.ref' );
} }
@ -263,21 +263,50 @@ sub tryplot
unshift @options, @{$args{options}}; unshift @options, @{$args{options}};
my $feedgnuplot = "$Bin/../bin/feedgnuplot"; my $feedgnuplot = "$Bin/../bin/feedgnuplot";
note( "Running test '$args{testname}'. Running: $args{cmd} | $feedgnuplot " .
shell_quote(@options));
my $out = ''; my $out = '';
my $err = ''; my $err = '';
open IN, '-|', $args{cmd} or die "Couldn't open pipe to $args{cmd}"; open IN, '-|', $args{cmd} or die "Couldn't open pipe to $args{cmd}";
run [$feedgnuplot, @options], run [$feedgnuplot, @options],
\*IN, \$out, \$err; \*IN, \$out, \$err;
note( "Running test '$args{testname}'. Running: $args{cmd} | $feedgnuplot " . # Ignore any screen refresh characters gnuplot may be outputting
shell_quote(@options)); $out =~ s/ \s*\n//g;
is($err, '', "$args{testname} stderr" );
is($out, $args{refplot}, "$args{testname} stdout"); my $refplot_filename = "$Bin/$args{refplot}";
my $refplot_data = readfile($refplot_filename);
is($err, '', "$args{testname} stderr" );
is("\n$out", "\n$refplot_data", "$args{testname} stdout");
# Enable, to replace the reference plots with what we observe
if(0)
{
if ($out ne $refplot_data)
{
print("Overwrite '$refplot_filename'? ");
my $x = <STDIN>;
chomp $x;
if ( !(!$x || $x =~ /^no?$/i) )
{
open my $fd, '>', $refplot_filename
or die "Couldn't open '$refplot_filename' for writing";
print $fd $out;
close $fd;
print("Overwrote '$refplot_filename'\n");
}
}
}
print("\n\n");
} }
sub readfile sub readfile
{ {
my $path = "$Bin/$_[0]"; my $path = $_[0];
open my $fd, '<', $path or die "Couldn't open '$path'"; open my $fd, '<', $path or die "Couldn't open '$path'";
local $/ = undef; local $/ = undef;

View File

@ -37,7 +37,6 @@
-1 A*----------------+-----------------+-----------------+-----------------+----------------++ -1 A*----------------+-----------------+-----------------+-----------------+----------------++
-1 -0.8 -0.6 -0.4 -0.2 0 -1 -0.8 -0.6 -0.4 -0.2 0
2 ++---------------------+---------------------+----------------------+--------------------*A 2 ++---------------------+---------------------+----------------------+--------------------*A
+ + + + **** + + + + + **** +
@ -77,7 +76,6 @@
-1 A+---------------------+---------------------+----------------------+--------------------++ -1 A+---------------------+---------------------+----------------------+--------------------++
-1 -0.5 0 0.5 1 -1 -0.5 0 0.5 1
3 ++-------------+--------------+--------------+--------------+--------------+-------------*A 3 ++-------------+--------------+--------------+--------------+--------------+-------------*A
+ + + + + + **** + + + + + + + **** +
@ -117,7 +115,6 @@
-1 A+-------------+--------------+--------------+--------------+--------------+-------------++ -1 A+-------------+--------------+--------------+--------------+--------------+-------------++
-1 -0.5 0 0.5 1 1.5 2 -1 -0.5 0 0.5 1 1.5 2
4 ++----------+----------+-----------+----------+-----------+----------+-----------+---------*A 4 ++----------+----------+-----------+----------+-----------+----------+-----------+---------*A
+ + + + + + + + *** + + + + + + + + + *** +
@ -157,7 +154,6 @@
-1 A+----------+----------+-----------+----------+-----------+----------+-----------+---------++ -1 A+----------+----------+-----------+----------+-----------+----------+-----------+---------++
-1 -0.5 0 0.5 1 1.5 2 2.5 3 -1 -0.5 0 0.5 1 1.5 2 2.5 3
5 ++----------------+------------------+-----------------+------------------+----------------*A 5 ++----------------+------------------+-----------------+------------------+----------------*A
+ + + + + *** + + + + + + *** +
@ -197,7 +193,6 @@
-1 A+----------------+------------------+-----------------+------------------+----------------++ -1 A+----------------+------------------+-----------------+------------------+----------------++
-1 0 1 2 3 4 -1 0 1 2 3 4
6 ++----------------+------------------+-----------------+------------------+----------------*A 6 ++----------------+------------------+-----------------+------------------+----------------*A
+ + + + + ** + + + + + + ** +
@ -237,7 +232,6 @@
-1 A*----------------+------------------+-----------------+------------------+----------------++ -1 A*----------------+------------------+-----------------+------------------+----------------++
-1 -0.8 -0.6 -0.4 -0.2 0 -1 -0.8 -0.6 -0.4 -0.2 0
7 ++---------------------+----------------------+----------------------+-----------------*****A 7 ++---------------------+----------------------+----------------------+-----------------*****A
+ + + + ************ + + + + + ************ +
@ -277,7 +271,6 @@
-1 A+---------------------+----------------------+----------------------+---------------------++ -1 A+---------------------+----------------------+----------------------+---------------------++
-1 -0.5 0 0.5 1 -1 -0.5 0 0.5 1
8 ++-------------+---------------+--------------+--------------+---------------+-----------***A 8 ++-------------+---------------+--------------+--------------+---------------+-----------***A
+ + + + + + ******** + + + + + + + ******** +
@ -317,7 +310,6 @@
-1 A+-------------+---------------+--------------+--------------+---------------+-------------++ -1 A+-------------+---------------+--------------+--------------+---------------+-------------++
-1 -0.5 0 0.5 1 1.5 2 -1 -0.5 0 0.5 1 1.5 2
10 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++ 10 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++
+ + + + + + + + + + + + + + + + + +
@ -357,7 +349,6 @@
-2 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++ -2 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++
-1 -0.5 0 0.5 1 1.5 2 2.5 3 -1 -0.5 0 0.5 1 1.5 2 2.5 3
10 ++----------------+-----------------+------------------+-----------------+--------------***A 10 ++----------------+-----------------+------------------+-----------------+--------------***A
+ + + + + ****** + + + + + + ****** +

View File

@ -37,7 +37,6 @@
0 ++------A*---------------+---------------+---------------+----------------+--------------++ 0 ++------A*---------------+---------------+---------------+----------------+--------------++
1 1.2 1.4 1.6 1.8 2 1 1.2 1.4 1.6 1.8 2
2 ++------+----------------+---------------+---------------+----------------+--------------*A 2 ++------+----------------+---------------+---------------+----------------+--------------*A
| + + + + + ** + | + + + + + ** +

View File

@ -1,40 +1,39 @@
5 +-----------------------------------------------------------------------------------------+
5 ++---+---+----+---+----+---+----+---+----+---+----+---A----+---+----+---+----+---+----+--++ | + + + |
+ + + + + | |
| | | |
| | 4.5 |-+ +-|
4.5 ++ ++ | |
| | | |
| | | |
| | | |
| | 4 |-+ A +-|
4 ++ A ++ | |
| | | |
| | | |
| | 3.5 |-+ +-|
3.5 ++ ++ | |
| | | |
| | | |
| | | |
3 ++ A ++ 3 |-+ A +-|
| | | |
| | | |
| | | |
| | 2.5 |-+ +-|
2.5 ++ ++ | |
| | | |
| | | |
| | | |
2 ++ A ++ 2 |-+ A +-|
| | | |
| | | |
| | | |
| | 1.5 |-+ +-|
1.5 ++ ++ | |
| | | |
| | | |
+ + + + + | + + + |
1 ++---+---+----+---+----+---+----+---A----+---+----+---+----+---+----+---+----+---+----+--++ 1 +-----------------------------------------------------------------------------------------+
05:00 05:05 05:10 05:15 05:20 05:00 05:05 05:10 05:15 05:20

View File

@ -1,40 +1,39 @@
10 +-----------------------------------------------------------------------------------------+
10 ++---------+-----------+----------+----------+----------+-----------+----------+---------+A | + + + + + + + |
+ + + + + + + + + | |
| | | |
| | 9.5 |-+ +-|
9.5 ++ ++ | |
| | | |
| | | |
| | | |
| | 9 |-+ A +-|
9 ++ A ++ | |
| | | |
| | | |
| | 8.5 |-+ +-|
8.5 ++ ++ | |
| | | |
| | | |
| | | |
8 ++ A ++ 8 |-+ A +-|
| | | |
| | | |
| | | |
| | 7.5 |-+ +-|
7.5 ++ ++ | |
| | | |
| | | |
| | | |
7 ++ A ++ 7 |-+ A +-|
| | | |
| | | |
| | | |
| | 6.5 |-+ +-|
6.5 ++ ++ | |
| | | |
| | | |
+ + + + + + + + + | + + + + + + + |
6 A+---------+-----------+----------+----------+----------+-----------+----------+---------++ 6 +-----------------------------------------------------------------------------------------+
05:07 05:07 05:08 05:08 05:09 05:09 05:10 05:10 05:11 05:07 05:07 05:08 05:08 05:09 05:09 05:10 05:10 05:11

View File

@ -37,7 +37,6 @@
-4 A*----------------+------------------+-----------------+------------------+----------------++ -4 A*----------------+------------------+-----------------+------------------+----------------++
05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06
2 ++---------------------+----------------------+----------------------+-------------------***A 2 ++---------------------+----------------------+----------------------+-------------------***A
+ + + + ******** + + + + + ******** +
@ -77,7 +76,6 @@
-4 A+---------------------+----------------------+----------------------+---------------------++ -4 A+---------------------+----------------------+----------------------+---------------------++
05:06 05:06 05:07 05:07 05:08 05:06 05:06 05:07 05:07 05:08
3 ++-------------+---------------+--------------+--------------+---------------+-----------***A 3 ++-------------+---------------+--------------+--------------+---------------+-----------***A
+ + + + + + ****** + + + + + + + ****** +
@ -117,7 +115,6 @@
-4 A+-------------+---------------+--------------+--------------+---------------+-------------++ -4 A+-------------+---------------+--------------+--------------+---------------+-------------++
05:06 05:06 05:07 05:07 05:08 05:08 05:09 05:06 05:06 05:07 05:07 05:08 05:08 05:09
4 ++----------+----------+-----------+----------+-----------+----------+-----------+--------**A 4 ++----------+----------+-----------+----------+-----------+----------+-----------+--------**A
+ + + + + + + + ****** + + + + + + + + + ****** +
@ -157,7 +154,6 @@
-4 A+----------+----------+-----------+----------+-----------+----------+-----------+---------++ -4 A+----------+----------+-----------+----------+-----------+----------+-----------+---------++
05:06 05:06 05:07 05:07 05:08 05:08 05:09 05:09 05:10 05:06 05:06 05:07 05:07 05:08 05:08 05:09 05:09 05:10
5 ++----------------+------------------+-----------------+------------------+---------------**A 5 ++----------------+------------------+-----------------+------------------+---------------**A
+ + + + + **** + + + + + + **** +
@ -197,7 +193,6 @@
-4 A+----------------+------------------+-----------------+------------------+----------------++ -4 A+----------------+------------------+-----------------+------------------+----------------++
05:06 05:07 05:08 05:09 05:10 05:11 05:06 05:07 05:08 05:09 05:10 05:11
6 ++----------------+------------------+-----------------+------------------+----------------*A 6 ++----------------+------------------+-----------------+------------------+----------------*A
+ + + + + ** + + + + + + ** +
@ -237,7 +232,6 @@
-4 A*----------------+------------------+-----------------+------------------+----------------++ -4 A*----------------+------------------+-----------------+------------------+----------------++
05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06 05:06
8 ++---------------------+----------------------+----------------------+---------------------++ 8 ++---------------------+----------------------+----------------------+---------------------++
+ + + + + + + + + +
@ -277,7 +271,6 @@
-4 A+---------------------+----------------------+----------------------+---------------------++ -4 A+---------------------+----------------------+----------------------+---------------------++
05:06 05:06 05:07 05:07 05:08 05:06 05:06 05:07 05:07 05:08
8 ++-------------+---------------+--------------+--------------+---------------+---------*****A 8 ++-------------+---------------+--------------+--------------+---------------+---------*****A
+ + + + + ********** + + + + + + ********** +
@ -317,7 +310,6 @@
-4 A+-------------+---------------+--------------+--------------+---------------+-------------++ -4 A+-------------+---------------+--------------+--------------+---------------+-------------++
05:06 05:06 05:07 05:07 05:08 05:08 05:09 05:06 05:06 05:07 05:07 05:08 05:08 05:09
10 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++ 10 ++---------+-----------+----------+-----------+----------+----------+-----------+---------++
+ + + + + + + + + + + + + + + + + +
@ -357,7 +349,6 @@
-4 A+---------+-----------+----------+-----------+----------+----------+-----------+---------++ -4 A+---------+-----------+----------+-----------+----------+----------+-----------+---------++
05:06 05:06 05:07 05:07 05:08 05:08 05:09 05:09 05:10 05:06 05:06 05:07 05:07 05:08 05:08 05:09 05:09 05:10
10 ++----------------+-----------------+------------------+-----------------+-------------****A 10 ++----------------+-----------------+------------------+-----------------+-------------****A
+ + + + + ********* + + + + + + ********* +

View File

@ -37,7 +37,6 @@
-4 ++-------------+---------------A--------------+--------------+---------------+-------------++ -4 ++-------------+---------------A--------------+--------------+---------------+-------------++
05:05 05:05 05:06 05:06 05:07 05:07 05:08 05:05 05:05 05:06 05:06 05:07 05:07 05:08
2 ++-------------+---------------+--------------+--------------+---------------+------------**A 2 ++-------------+---------------+--------------+--------------+---------------+------------**A
+ + + + + + ***** + + + + + + + ***** +

View File

@ -1,40 +1,39 @@
5.5 +-----------------------------------------------------------------------------------------+
5.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------** | + + + + + + + |
+ + + + + + + + * | |
| * | |
5 ++ +A 5 |-+ +-|
| * | |
| * | |
| * 4.5 |-+ +*|
4.5 ++ ** | *** |
| *** | | * |
| * | | * |
4 ++ A ++ 4 |-+ A +-|
| * | | * |
| * | | * |
| *** | 3.5 |-+ *** +-|
3.5 ++ ++ | |
| *** | | *** |
| * | | * |
3 ++ A ++ 3 |-+ A +-|
| * | | * |
| * | | *** |
| *** | | |
2.5 ++ ++ 2.5 |-+ +-|
| | | |
| *** | | *** |
2 ++ A ++ 2 |-+ A +-|
| * | | * |
| *** | | *** |
| | | |
1.5 ++ ++ 1.5 |-+ +-|
| | | |
| | | |
1 A* ++ 1 |*+ +-|
** | |* |
| | | |
+ + + + + + + + + | + + + + + + + |
0.5 ++---------+-----------+----------+----------+----------+-----------+----------+---------++ 0.5 +-----------------------------------------------------------------------------------------+
05:08 05:08 05:09 05:09 05:10 05:10 05:11 05:11 05:12 05:08 05:08 05:09 05:09 05:10 05:10 05:11 05:11 05:12