Commit e63c34f4 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

rename testdata/city_temperatures_pivot.csv -> testdata/city_temperatures.csv

parent 1f83ae70

examples/charts/linechart_multiple_groups.fvz

+8 −8
Original line number Diff line number Diff line
@@ -9,23 +9,23 @@ 
    ticks-y (linear 5 -20)

    axes (bottom left)

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_nyc)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_nyc)

        color (#4572a7)

        marker-size (3pt))

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_beijing)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_beijing)

        color (#aa4643)

        marker-size (3pt))

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_moscow)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_moscow)

        color (#89a54e)

        marker-size (3pt))

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_berlin)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_berlin)

        color (#80699b)

        marker-size (3pt))

    legend (

tests/spec/chart/combochart_lines.fvz

+8 −8
Original line number Diff line number Diff line
@@ -9,23 +9,23 @@ 
    ticks-y (linear 5 -20)

    axes (bottom left)

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_nyc)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_nyc)

        color (#4572a7)

        marker-size (3pt))

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_beijing)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_beijing)

        color (#aa4643)

        marker-size (3pt))

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_moscow)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_moscow)

        color (#89a54e)

        marker-size (3pt))

    lines (

        data-x (csv "tests/testdata/city_temperatures_pivot.csv" month)

        data-y (csv "tests/testdata/city_temperatures_pivot.csv" temp_berlin)

        data-x (csv "tests/testdata/city_temperatures.csv" month)

        data-y (csv "tests/testdata/city_temperatures.csv" temp_berlin)

        color (#80699b)

        marker-size (3pt))

    legend (

tests/testdata/city_temperatures.csv

+13 −49
Original line number Diff line number Diff line 
city,month,temperature

New York,1,-0.2

New York,2,0.8

New York,3,5.7

New York,4,11.3

New York,5,17.0

New York,6,22.0

New York,7,24.8

New York,8,24.1

New York,9,20.1

New York,10,14.1

New York,11,8.6

New York,12,2.5

北京市   ,1,-4

北京市   ,2,-1.4

北京市   ,3,5.4

北京市   ,4,13.5

北京市   ,5,19.9

北京市   ,6,24.3

北京市   ,7,26.3

北京市   ,8,24.9

北京市   ,9,19.9

北京市   ,10,13.1

北京市   ,11,4.7

北京市   ,12,-1.8

Москва,1,-7.4

Москва,2,-5.8

Москва,3,-0.1

Москва,4,7.1

Москва,5,14.7

Москва,6,17.7

Москва,7,20.6

Москва,8,18.8

Москва,9,12.6

Москва,10,6.1

Москва,11,1.1

Москва,12,-3.6

Berlin,1,-0.9

Berlin,2,0.6

Berlin,3,3.5

Berlin,4,8.4

Berlin,5,13.5

Berlin,6,17.0

Berlin,7,18.6

Berlin,8,17.9

Berlin,9,14.3

Berlin,10,9.0

Berlin,11,3.9

Berlin,12,1.0
 
month,month_name,temp_london,temp_nyc,temp_beijing,temp_moscow,temp_berlin

1,Jan,3.9,-0.2,-4,-7.4,-0.9

2,Feb,4.2,0.8,-1.4,-5.8,0.6

3,Mar,5.7,5.7,5.4,-0.1,3.5

4,Apr,8.5,11.3,13.5,7.1,8.4

5,May,11.9,17.0,19.9,14.7,13.5

6,Jun,15.2,22.0,24.3,17.7,17.0

7,Jul,17.0,24.8,26.3,20.6,18.6

8,Aug,16.6,24.1,24.9,18.8,17.9

9,Sep,14.2,20.1,19.9,12.6,14.3

10,Oct,10.3,14.1,13.1,6.1,9.0

11,Nov,6.6,8.6,4.7,1.1,3.9

12,Dec,4.8,2.5,-1.8,-3.6,1.0

tests/testdata/city_temperatures.sql

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
IMPORT TABLE city_temperatures

   FROM 'csv:doc/tests/testdata/city_temperatures.csv?headers=true';



DRAW LINECHART AXIS BOTTOM;



SELECT

  'Berlin' AS series,

  temperature AS x,

  temperature AS y

FROM

  city_temperatures

WHERE city = "Berlin";



SELECT

  'Tokyo' AS series,

  temperature AS x,

  temperature AS y

FROM

  city_temperatures

WHERE city = "Tokyo";

tests/testdata/city_temperatures_pivot.csv

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
month,month_name,temp_london,temp_nyc,temp_beijing,temp_moscow,temp_berlin

1,Jan,3.9,-0.2,-4,-7.4,-0.9

2,Feb,4.2,0.8,-1.4,-5.8,0.6

3,Mar,5.7,5.7,5.4,-0.1,3.5

4,Apr,8.5,11.3,13.5,7.1,8.4

5,May,11.9,17.0,19.9,14.7,13.5

6,Jun,15.2,22.0,24.3,17.7,17.0

7,Jul,17.0,24.8,26.3,20.6,18.6

8,Aug,16.6,24.1,24.9,18.8,17.9

9,Sep,14.2,20.1,19.9,12.6,14.3

10,Oct,10.3,14.1,13.1,6.1,9.0

11,Nov,6.6,8.6,4.7,1.1,3.9

12,Dec,4.8,2.5,-1.8,-3.6,1.0

CRA Git | Maintained and supported by SUSTech CRA and CCSE