commit a596d5f277f7c8c6a8f2efeddf50dcef0c564282
author Marc Kupietz <kupietz@ids-mannheim.de> Sat Jul 24 17:37:33 2021 +0200
committer Gerrit Code Review <gerrit2@korap.ids-mannheim.de> Sat Jul 24 17:37:33 2021 +0200
tree 842c66e1b1c4ff4e4e29b5f26ea2ce8c6decd4fb
parent aed5176a155ad82d41fce5d539ec8f9bc60e7cbc
parent 5bbfb927b945bc905a9cec7e047a87c99edd4c12

Merge "Make Ubuntu installation even more fail safe"

KorAPClient/__init__.py

diff --git a/KorAPClient/__init__.py b/KorAPClient/__init__.py
index c6e6699..1e0ba2c 100644
--- a/KorAPClient/__init__.py
+++ b/KorAPClient/__init__.py
@@ -105,7 +105,7 @@
 
         Returns:
             DataFrame with columns `'node', 'collocate', 'label', 'vc','webUIRequestUrl', 'w',  'leftContextSize',
-               'rightContextSize', 'N', 'O', 'O2', 'E', 'pmi', 'mi2', 'mi3', 'logDice' `
+               'rightContextSize', 'N', 'O', 'O1', 'O2', 'E', 'pmi', 'mi2', 'mi3', 'logDice', 'll'`
 
         Example:
             ```

Readme.md

diff --git a/Readme.md b/Readme.md
index d83772c..da2981a 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()

figures/hello-world.png

diff --git a/figures/hello-world.png b/figures/hello-world.png
index 6e2f27d..58579df 100644
--- a/figures/hello-world.png
+++ b/figures/hello-world.png
Binary files differ