diff --git a/MomentOfInertia/sheet b/MomentOfInertia/sheet
new file mode 100644
index 0000000000000000000000000000000000000000..72cea8172cdec8b1880e0ade1af3633a98930dc5
--- /dev/null
+++ b/MomentOfInertia/sheet
@@ -0,0 +1,8 @@
+99.92 100.12 94.94 34.96 6.10 33.08 34.96 5.88 33.14 610.0 -
+100.02 100.10 94.04 34.96 6.00 33.06 34.96 6.12 33.04 609.0 114.8
+100.80 99.82 93.88 34.98 6.10 33.08 34.92 6.10 33.20 610.0 -
+712.6 721.4 - 239.8 - - 239.4 - - 130.1 1251.0
+
+1.386 1.743 2.723 3.588 4.566 5.664 6.700 2.327 1.496 0.853
+1.386 1.744 2.721 3.616 4.554 5.666 6.808 2.327 1.495 0.854
+1.387 1.744 2.751 3.634 4.554 5.686 6.700 2.328 1.496 0.854
\ No newline at end of file
diff --git a/PhotoelectricEffect/1.csv b/PhotoelectricEffect/1.csv
new file mode 100644
index 0000000000000000000000000000000000000000..7cbdbb57c32cd5cadd47d1bb52d5063630f52dfb
--- /dev/null
+++ b/PhotoelectricEffect/1.csv
@@ -0,0 +1,5 @@
+5.196,0.5855
+5.490,0.7190
+6.873,1.1980
+7.408,1.4415
+8.214,1.6885
\ No newline at end of file
diff --git a/PhotoelectricEffect/2-1.csv b/PhotoelectricEffect/2-1.csv
new file mode 100644
index 0000000000000000000000000000000000000000..90353186af002502cba0baabc3ec403e31701915
--- /dev/null
+++ b/PhotoelectricEffect/2-1.csv
@@ -0,0 +1,21 @@
+-0.3,1
+1.2,6
+2.7,12
+4.2,14
+5.7,16
+7.2,18
+8.7,20
+10.2,22
+11.7,23
+13.2,24
+14.7,25
+16.2,26
+17.7,27
+19.2,28
+20.7,29
+22.2,29
+23.7,30
+25.2,30
+26.7,31
+28.2,31
+29.7,31
diff --git a/PhotoelectricEffect/2-2.csv b/PhotoelectricEffect/2-2.csv
new file mode 100644
index 0000000000000000000000000000000000000000..57314ed9919466acdd623927768d410f0e7ccf3d
--- /dev/null
+++ b/PhotoelectricEffect/2-2.csv
@@ -0,0 +1,21 @@
+-0.4,1
+1.1,21
+2.6,40
+4.1,52
+5.6,60
+7.1,68
+8.6,76
+10.1,83
+11.6,88
+13.1,93
+14.6,98
+16.1,102
+17.6,106
+19.1,110
+20.6,113
+22.1,116
+23.6,119
+25.1,122
+26.6,124
+28.1,125
+29.6,127
\ No newline at end of file
diff --git a/PhotoelectricEffect/2-3.csv b/PhotoelectricEffect/2-3.csv
new file mode 100644
index 0000000000000000000000000000000000000000..4ce417d76b6ebc78704e81b8dc3c957edef4b635
--- /dev/null
+++ b/PhotoelectricEffect/2-3.csv
@@ -0,0 +1,21 @@
+-0.7,1
+0.8,43
+2.3,92
+3.8,138
+5.3,175
+6.8,209
+8.3,236
+9.8,259
+11.3,284
+12.8,305
+14.3,323
+15.8,341
+17.3,359
+18.8,373
+20.3,388
+21.8,401
+23.3,413
+24.8,424
+26.3,434
+27.8,444
+29.3,453
\ No newline at end of file
diff --git a/PhotoelectricEffect/3-1.csv b/PhotoelectricEffect/3-1.csv
new file mode 100644
index 0000000000000000000000000000000000000000..62632488dd67dd42d61becfaa1abc5a6f0d44731
--- /dev/null
+++ b/PhotoelectricEffect/3-1.csv
@@ -0,0 +1,3 @@
+4,31
+16,110
+64,410
\ No newline at end of file
diff --git a/PhotoelectricEffect/3-2.csv b/PhotoelectricEffect/3-2.csv
new file mode 100644
index 0000000000000000000000000000000000000000..c90e8e53c663db60dc5a6961fca98c583de60ea4
--- /dev/null
+++ b/PhotoelectricEffect/3-2.csv
@@ -0,0 +1,3 @@
+4,11
+16,44
+64,149
\ No newline at end of file
diff --git a/PhotoelectricEffect/draw.py b/PhotoelectricEffect/draw.py
new file mode 100755
index 0000000000000000000000000000000000000000..49ad444e7740e729ea5b620a13f1ff7843d0df60
--- /dev/null
+++ b/PhotoelectricEffect/draw.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+import sys
+sys.path.append('..')
+import quickmap
+
+x1, y1 = quickmap.DataFileToXYArray('1.csv', wordDelimiter = ',')
+quickmap.GetMap(x1, y1, polyLine=True)
+
+x21, y21 = quickmap.DataFileToXYArray('2-1.csv', wordDelimiter = ',')
+x22, y22 = quickmap.DataFileToXYArray('2-2.csv', wordDelimiter = ',')
+x23, y23 = quickmap.DataFileToXYArray('2-3.csv', wordDelimiter = ',')
+quickmap.GetMultiMap(quickmap.GetLine(x21, y21, smoothLine=True) + quickmap.GetLine(x22, y22, smoothLine=True) + quickmap.GetLine(x23, y23, smoothLine=True))
+
+x31, y31 = quickmap.DataFileToXYArray('3-1.csv', wordDelimiter = ',')
+x32, y32 = quickmap.DataFileToXYArray('3-2.csv', wordDelimiter = ',')
+quickmap.GetMultiMap(quickmap.GetLine(x31, y31, polyLine=True) + quickmap.GetLine(x32, y32, polyLine=True))
diff --git a/PhotoelectricEffect/t1.txt b/PhotoelectricEffect/t1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5736f574805e5464ab2e052fea5c13e388dac7c2
--- /dev/null
+++ b/PhotoelectricEffect/t1.txt
@@ -0,0 +1,7 @@
+8.214 1.767
+7.408 1.535
+6.879 1.282
+5.490 0.744
+5.196 0.637
+# fake points
+0 -1.35405459
\ No newline at end of file
diff --git a/PhotoelectricEffect/tt2-1 b/PhotoelectricEffect/tt2-1
new file mode 100644
index 0000000000000000000000000000000000000000..91af1c24a8a60772088ff87d3d1bd9a6c3d8c781
--- /dev/null
+++ b/PhotoelectricEffect/tt2-1
@@ -0,0 +1,23 @@
+#-2.2 0.0
+-0.5 1.0
+1 25
+2.5 36
+4 45
+5.5 54
+7 62
+8.5 70
+10 76
+11.5 82
+13 87
+14.5 91
+16 94
+17.5 96
+19 99
+20.5 102
+22 104
+23.5 106
+25 107
+26.5 109
+28 110
+29.5 112
+31 113
\ No newline at end of file
diff --git a/PhotoelectricEffect/tt2-2 b/PhotoelectricEffect/tt2-2
new file mode 100644
index 0000000000000000000000000000000000000000..51b4d928480c1e0b7005e6c4027e2e1fa67156f0
--- /dev/null
+++ b/PhotoelectricEffect/tt2-2
@@ -0,0 +1,23 @@
+#-2.5 0
+-0.5 5
+1 100
+2.5 138
+4 173
+5.5 207
+7 236
+8.5 265
+10 291
+11.5 314
+13 333
+14.5 348
+16 361
+17.5 372
+19 382
+20.5 391
+22 399
+23.5 406
+25 413
+26.5 419
+28 425
+29.5 430
+31 433
\ No newline at end of file
diff --git a/PhotoelectricEffect/tt2-3 b/PhotoelectricEffect/tt2-3
new file mode 100644
index 0000000000000000000000000000000000000000..c10eb836b68b6dd41a4d9e81b49280dbd7a90001
--- /dev/null
+++ b/PhotoelectricEffect/tt2-3
@@ -0,0 +1,23 @@
+-0.6 0
+-0.5 19
+1 366
+2.5 526
+4 651
+5.5 767
+7 879
+8.5 980
+10 1082
+11.5 1162
+13 1243
+14.5 1301
+16 1352
+17.5 1400
+19 1437
+20.5 1473
+22 1508
+23.5 1545
+25 1571
+26.5 1598
+28 1616
+29.5 1638
+31 1659
\ No newline at end of file
diff --git a/README.md b/README.md
index 621dc1b2a41a3bd82fdc937f8c9cd2df12c2f40b..3349acf16f073ad855ab7af9f09f05d898cf4a4b 100644
--- a/README.md
+++ b/README.md
@@ -8,3 +8,10 @@ You can also get data processor at https://recolic.net/phy and https://recolic.n
Tip: folder name with leading lowercase letter indicates: this experiment was made at first semester.
with leading uppercase letter : second
'''
+
+## 黑åå•
+
+电路的暂æ€è¿‡ç¨‹ 柯圣志 ç¦æ¢ä½¿ç”¨è®¡ç®—机作图 对抄写报告è¦æ±‚ä¸¥æ ¼
+电路的暂æ€è¿‡ç¨‹ éåˆæž— ç¦æ¢ä½¿ç”¨è®¡ç®—机作图
+液体表é¢å¼ 力 å¼ ä½³ ç¦æ¢ä½¿ç”¨è®¡ç®—机作图
+
diff --git a/quickmap.py b/quickmap.py
index ad7a5f3ede3552884c727f8261f128c785fc2731..ab9b1d0c767e05870e04ca0d0dc7ba8440591c32 100644
--- a/quickmap.py
+++ b/quickmap.py
@@ -37,7 +37,7 @@ def GetMultiMap(lines, windowSizeX=12, windowSizeY=8):
'''
Usage: GetMultiMap(GetLine([1,2,3], [1,4,9]) + GetLine([2,2.1,2.2], [6,7,8]) + ...)
'''
- colors = ['red', 'orange', 'blue', 'green', 'yellow', 'magenta', 'cyan', 'black'] # You can add more color like: '#123456', '#FFFFAE', etc
+ colors = ['red', 'orange', 'blue', 'green', '#009999', '#00cccc', 'yellow', 'black'] # You can add more color like: '#123456', '#FFFFAE', etc
def __fetchColor():
for color in colors:
yield color
@@ -53,6 +53,7 @@ def GetMultiMap(lines, windowSizeX=12, windowSizeY=8):
raise ValueError('Invalid line passed to GetMultiMap. Assertion len(px) == len(py) failed because {} != {}.'.format(len(px), len(py)))
if len(px) != 0:
plt.plot(px, py, color=fetchColor(), label="Fitting Line ({})".format(name), linewidth=2)
+ #plt.legend()
plt.grid()
plt.show()