fix bug

data/1.python初阶/3.进阶语法/10.字符编码与解码/encode.md

@@ -11,8 +11,8 @@ if __name__ == '__main__':
     utf8_str = unicode_str.encode('utf-8')
     print(utf8_str)
 
-    unicode_str_again = utf8_str.decode('utf-8')
-    print(unicode_str_again)
+    # TODO(You)：请在此实现代码
+    unicode_str_again = ...
     assert unicode_str_again == unicode_str
 ```
 
@@ -36,22 +36,25 @@ if __name__ == '__main__':
 ## 答案
 
 ```python
-
+unicode_str_again = utf8_str.decode('utf-8')
 ```
 
 ## 选项
 
 ### A
-```python
 
+```python
+unicode_str_again = utf8_str.decode()
 ```
 
 ### B
-```python
 
+```python
+unicode_str_again = utf8_str.decode('unicode')
 ```
 
 ### C
-```python
 
+```python
+unicode_str_again = utf8_str.encode('unicode')
 ```

data/3.python高阶/2.结构化数据分析工具Pandas/2.数据结构/dataframe.json

 {
-  "source": "dataframe.py",
-  "depends": [],
+  "source": "dataframe.md",
   "exercise_id": 119,
-  "type": "code_options"
+  "depends": [],
+  "type": "code_options",
+  "author": "huanhuilong",
+  "notebook_enable": true
 }
\ No newline at end of file

data/3.python高阶/2.结构化数据分析工具Pandas/2.数据结构/dataframe.md

+# pandas 创建dataframe
+
+创建dataframe的几种方式
+
+```python
+import pandas as pd
+import numpy as np
+
+
+def create_dataframe_from_list():
+    # TODO(You)：请在此编写代码
+    return data_df
+
+
+def create_dataframe_from_series():
+    # TODO(You)：请在此编写代码
+    return data_df
+
+
+def create_dataframe_from_2darray():
+    # TODO(You)：请在此编写代码
+    return data_df
+
+
+def create_dataframe_from_dict():
+   # TODO(You)：请在此编写代码
+    return data_df
+
+
+if __name__ == '__main__':
+    print('由数组list组成的字典创建dataframe:')
+    data_df = create_dataframe_from_list()
+    print(data_df)
+
+    print('由Series组成的字典创建dataframe:')
+    data_df = create_dataframe_from_series()
+    print(data_df)
+
+    print('通过二维数组直接创建dataframe:')
+    data_df = create_dataframe_from_2darray()
+    print(data_df)
+
+    print('由字典组成的列表创建dataframe:')
+    data_df = create_dataframe_from_dict()
+    print(data_df)
+```
+
+请选出下列对**TODO**部分实现，**描述错误** 的选项。
+
+## template
+
+```python
+import pandas as pd
+import numpy as np
+
+
+def create_dataframe_from_list():
+    data = {
+        'cloumn_one': np.random.randint(0, 10, size=5),
+        'cloumn_two': np.random.randint(0, 10, size=5),
+        'cloumn_three': np.random.randint(0, 10, size=5)
+    }
+    data_df = pd.DataFrame(data)
+    return data_df
+
+
+def create_dataframe_from_series():
+    data = {
+        'cloumn_one': pd.Series(np.random.randint(0, 10, size=5)),
+        'cloumn_two': pd.Series(np.random.randint(0, 10, size=5)),
+        'cloumn_three': pd.Series(np.random.randint(0, 10, size=5))
+    }
+    data_df = pd.DataFrame(data)
+    return data_df
+
+
+def create_dataframe_from_2darray():
+    data = np.random.randint(0, 10, size=9).reshape(3, 3)
+    data_df = pd.DataFrame(
+        data, columns=['cloumn_one', 'cloumn_two', 'cloumn_three'])
+    return data_df
+
+
+def create_dataframe_from_dict():
+    data = [{'cloumn_one': 1, 'cloumn_two': 2, 'cloumn_three': 3},
+            {'cloumn_one': 5, 'cloumn_two': 6, 'cloumn_three': 7}]
+    data_df = pd.DataFrame(data)
+    return data_df
+
+
+if __name__ == '__main__':
+    print('由数组list组成的字典创建dataframe:')
+    data_df = create_dataframe_from_list()
+    print(data_df)
+
+    print('由Series组成的字典创建dataframe:')
+    data_df = create_dataframe_from_series()
+    print(data_df)
+
+    print('通过二维数组直接创建dataframe:')
+    data_df = create_dataframe_from_2darray()
+    print(data_df)
+
+    print('由字典组成的列表创建dataframe:')
+    data_df = create_dataframe_from_dict()
+    print(data_df)
+```
+
+## 答案
+
+```python
+# 该函数的输出数据只含有 cloumn_one  cloumn_two  cloumn_three 三个列
+def create_dataframe_from_dict():
+    data = [{'cloumn_one': 1, 'cloumn_two': 2, 'cloumn_three': 3},
+            {'cloumn_one': 5, 'cloumn_two': 6, 'cloumn_xxx': 7}]
+    data_df = pd.DataFrame(data)
+    return data_df
+```
+
+## 选项
+
+### A
+
+```python
+# 该函数的输出数据只含有 cloumn_one  cloumn_two  cloumn_three 三个列
+def create_dataframe_from_list():
+    data = {
+        'cloumn_one': np.random.randint(0, 10, size=5),
+        'cloumn_two': np.random.randint(0, 10, size=5),
+        'cloumn_three': np.random.randint(0, 10, size=5)
+    }
+    data_df = pd.DataFrame(data)
+    return data_df
+```
+
+### B
+
+```python
+# 该函数的输出数据只含有 cloumn_one  cloumn_two  cloumn_three 三个列
+def create_dataframe_from_series():
+    data = {
+        'cloumn_one': pd.Series(np.random.randint(0, 10, size=5)),
+        'cloumn_two': pd.Series(np.random.randint(0, 10, size=5)),
+        'cloumn_three': pd.Series(np.random.randint(0, 10, size=5))
+    }
+    data_df = pd.DataFrame(data)
+    return data_df
+```
+
+### C
+
+```python
+# 该函数的输出数据只含有 cloumn_one  cloumn_two  cloumn_three 三个列
+def create_dataframe_from_2darray():
+    data = [
+        [3, 5, 2],
+        [2, 7, 9],
+        [5, 6, 9]
+    ]
+    data_df = pd.DataFrame(
+        data, columns=['cloumn_one', 'cloumn_two', 'cloumn_three'])
+    return data_df
+```

data/3.python高阶/2.结构化数据分析工具Pandas/2.数据结构/dataframe.py

@@ -7,45 +7,53 @@ import pandas as pd
 import numpy as np
 
 
-def create_dataframe(measure):
-    if measure == 1:
-        print('由数组list组成的字典创建dataframe:')
-        data = {
-            'cloumn_one': np.random.randint(0, 10, size=5),
-            'cloumn_two': np.random.randint(0, 10, size=5),
-            'cloumn_three': np.random.randint(0, 10, size=5)
-        }
-        data_df = pd.DataFrame(data)
-        print(data_df)
-
-    elif measure == 2:
-        print('由Series组成的字典创建dataframe:')
-        data = {
-            'cloumn_one': pd.Series(np.random.randint(0, 10, size=5)),
-            'cloumn_two': pd.Series(np.random.randint(0, 10, size=5)),
-            'cloumn_three': pd.Series(np.random.randint(0, 10, size=5))
-        }
-        data_df = pd.DataFrame(data)
-        print(data_df)
-    elif measure == 3:
-        print('通过二维数组直接创建dataframe:')
-        data = np.random.randint(0, 10, size=9).reshape(3, 3)
-        data_df = pd.DataFrame(
-            data, columns=['cloumn_one', 'cloumn_two', 'cloumn_three'])
-        print(data_df)
-    elif measure == 4:
-        print('由字典组成的列表创建dataframe:')
-        data = [{'cloumn_one': 1, 'cloumn_two': 2, 'cloumn_three': 3},
-                {'cloumn_one': 5, 'cloumn_two': 6, 'cloumn_three': 7}]
-        data_df = pd.DataFrame(data)
-        print(data_df)
-    else:
-        print('该参数不支持，可选参数为1，2，3，4')
+def create_dataframe_from_list():
+    data = {
+        'cloumn_one': np.random.randint(0, 10, size=5),
+        'cloumn_two': np.random.randint(0, 10, size=5),
+        'cloumn_three': np.random.randint(0, 10, size=5)
+    }
+    data_df = pd.DataFrame(data)
+    return data_df
+
+
+def create_dataframe_from_series():
+    data = {
+        'cloumn_one': pd.Series(np.random.randint(0, 10, size=5)),
+        'cloumn_two': pd.Series(np.random.randint(0, 10, size=5)),
+        'cloumn_three': pd.Series(np.random.randint(0, 10, size=5))
+    }
+    data_df = pd.DataFrame(data)
+    return data_df
+
+
+def create_dataframe_from_2darray():
+    data = np.random.randint(0, 10, size=9).reshape(3, 3)
+    data_df = pd.DataFrame(
+        data, columns=['cloumn_one', 'cloumn_two', 'cloumn_three'])
+    return data_df
+
+
+def create_dataframe_from_dict():
+    data = [{'cloumn_one': 1, 'cloumn_two': 2, 'cloumn_three': 3},
+            {'cloumn_one': 5, 'cloumn_two': 6, 'cloumn_three': 7}]
+    data_df = pd.DataFrame(data)
+    return data_df
 
 
 if __name__ == '__main__':
-    create_dataframe(1)
-    create_dataframe(2)
-    create_dataframe(3)
-    create_dataframe(4)
-    create_dataframe(0)
+    print('由数组list组成的字典创建dataframe:')
+    data_df = create_dataframe_from_list()
+    print(data_df)
+
+    print('由Series组成的字典创建dataframe:')
+    data_df = create_dataframe_from_series()
+    print(data_df)
+
+    print('通过二维数组直接创建dataframe:')
+    data_df = create_dataframe_from_2darray()
+    print(data_df)
+
+    print('由字典组成的列表创建dataframe:')
+    data_df = create_dataframe_from_dict()
+    print(data_df)