commit 2d981616b5bb16b447c6d3432f7dd84ce6ae72c2
author Marc Kupietz <kupietz@ids-mannheim.de> Fri Jun 18 12:47:05 2021 +0200
committer Gerrit Code Review <gerrit2@korap.ids-mannheim.de> Fri Jun 18 12:47:05 2021 +0200
tree 8e8b1ae96871cc042f3cc534571b777e13fee10e
parent e9695b7e8d6b7effec4f542bd4a9a075f9592900
parent 7fdb4150b12eda538024d83c82debf59e6f2fb6f

Merge changes I80f6ea7b,Iabfc017e

* changes:
  Use f-strings to simplify vc list construction in hello_world.py
  Fix error bars in hello_world.py

Readme.md

diff --git a/Readme.md b/Readme.md
index e299d80..3e57b5e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -65,13 +65,16 @@
 
 kcon = KorAPConnection(verbose=True)
 
-vcs = ["textType=/Zeit.*/ & pubPlaceKey=" + c + " & pubDate in " + str(y) for c in COUNTRIES for y in YEARS]
+vcs = [f"textType=/Zeit.*/ & pubPlaceKey={c} & pubDate in {y}" for c in COUNTRIES for y in YEARS]
 df = KorAPClient.ipm(kcon.frequencyQuery(QUERY, vcs))
+
 df['Year'] = [y for c in COUNTRIES for y in YEARS]
 df['Country'] = [c for c in COUNTRIES for y in YEARS]
+df['error_y'] = df["conf.high"] - df["ipm"]
+df['error_y_minus'] = df["ipm"] - df["conf.low"]
 
 fig = px.line(df, title=QUERY, x="Year", y="ipm", color="Country",
-              error_y="conf.high", error_y_minus="conf.low")
+              error_y="error_y", error_y_minus="error_y_minus")
 fig.show()
 ```
 ![Frequency per million words of “Hello World“ in DE vs. AT from 2010 to 2018 in newspapers and magazines](figures/hello-world.png)

examples/hello_world.py

diff --git a/examples/hello_world.py b/examples/hello_world.py
index 6ac91cc..f660a6d 100755
--- a/examples/hello_world.py
+++ b/examples/hello_world.py
@@ -8,13 +8,15 @@
 
 kcon = KorAPConnection(verbose=True)
 
-vcs = ["textType=/Zeit.*/ & pubPlaceKey=" + c + " & pubDate in " + str(y) for c in COUNTRIES for y in YEARS]
+vcs = [f"textType=/Zeit.*/ & pubPlaceKey={c} & pubDate in {y}" for c in COUNTRIES for y in YEARS]
 df = KorAPClient.ipm(kcon.frequencyQuery(QUERY, vcs))
 print(df)
 
 df['Year'] = [y for c in COUNTRIES for y in YEARS]
 df['Country'] = [c for c in COUNTRIES for y in YEARS]
+df['error_y'] = df["conf.high"] - df["ipm"]
+df['error_y_minus'] = df["ipm"] - df["conf.low"]
 
 fig = px.line(df, title=QUERY, x="Year", y="ipm", color="Country",
-              error_y="conf.high", error_y_minus="conf.low")
+              error_y="error_y", error_y_minus="error_y_minus")
 fig.show()