From ed83270068845553cd700bb8281bbb77cea7627a Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Thu, 5 May 2016 21:22:24 +0800 Subject: [PATCH 01/12] 5-5test --- experiments/my/wo | 2 ++ experiments/my/wo~ | 0 2 files changed, 2 insertions(+) create mode 100644 experiments/my/wo create mode 100644 experiments/my/wo~ diff --git a/experiments/my/wo b/experiments/my/wo new file mode 100644 index 0000000..91f47f4 --- /dev/null +++ b/experiments/my/wo @@ -0,0 +1,2 @@ +abc + diff --git a/experiments/my/wo~ b/experiments/my/wo~ new file mode 100644 index 0000000..e69de29 From 49bdbc54ac02a8a40d0ac40ceb8330b40ace37a1 Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Thu, 5 May 2016 21:48:29 +0800 Subject: [PATCH 02/12] a.out --- experiments/gcc-1-hello-world/abc | Bin 0 -> 8550 bytes experiments/gcc-1-hello-world/main.c | 1 + experiments/gcc-1-hello-world/main.c~ | 6 ++++++ 3 files changed, 7 insertions(+) create mode 100755 experiments/gcc-1-hello-world/abc create mode 100644 experiments/gcc-1-hello-world/main.c~ diff --git a/experiments/gcc-1-hello-world/abc b/experiments/gcc-1-hello-world/abc new file mode 100755 index 0000000000000000000000000000000000000000..bf033e50c12a51652df75b8b55e064e9ac45012a GIT binary patch literal 8550 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 literal 0 HcmV?d00001 diff --git a/experiments/gcc-1-hello-world/main.c b/experiments/gcc-1-hello-world/main.c index abfd4b3..923f713 100644 --- a/experiments/gcc-1-hello-world/main.c +++ b/experiments/gcc-1-hello-world/main.c @@ -2,5 +2,6 @@ int main(void) { printf("Hello world!\n"); + printf("another Hello world!\n"); return 0; } diff --git a/experiments/gcc-1-hello-world/main.c~ b/experiments/gcc-1-hello-world/main.c~ new file mode 100644 index 0000000..abfd4b3 --- /dev/null +++ b/experiments/gcc-1-hello-world/main.c~ @@ -0,0 +1,6 @@ +#include + +int main(void) { + printf("Hello world!\n"); + return 0; +} From 506a03574fe7c6f9895e2fb483c2850e7f0cdcfb Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Thu, 5 May 2016 22:05:22 +0800 Subject: [PATCH 03/12] homework --- experiments/gcc-2-multi-source/calculator.c | 7 +++++- experiments/gcc-2-multi-source/calculator.c~ | 22 +++++++++++++++++++ experiments/gcc-2-multi-source/main.c | 2 +- experiments/gcc-2-multi-source/main.c~ | 12 ++++++++++ experiments/gcc-3-real-project/calculator.c | 6 +++++ experiments/gcc-3-real-project/calculator.c~ | 22 +++++++++++++++++++ experiments/gcc-3-real-project/main.c~ | 14 ++++++++++++ experiments/gcc-3-real-project/result | Bin 0 -> 8764 bytes 8 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 experiments/gcc-2-multi-source/calculator.c~ create mode 100644 experiments/gcc-2-multi-source/main.c~ create mode 100644 experiments/gcc-3-real-project/calculator.c~ create mode 100644 experiments/gcc-3-real-project/main.c~ create mode 100755 experiments/gcc-3-real-project/result diff --git a/experiments/gcc-2-multi-source/calculator.c b/experiments/gcc-2-multi-source/calculator.c index 391fc7f..cc9b6de 100644 --- a/experiments/gcc-2-multi-source/calculator.c +++ b/experiments/gcc-2-multi-source/calculator.c @@ -1,5 +1,5 @@ #include "include/calculator.h" - +#include int sum(int x, int y) { return x + y; } @@ -13,5 +13,10 @@ int multiply(int x, int y) { } int divide(int x, int divisor) { + if(divisor != 0) return x / divisor; + else{ + printf("error:divisor can not be 0\n"); + return -1; + } } diff --git a/experiments/gcc-2-multi-source/calculator.c~ b/experiments/gcc-2-multi-source/calculator.c~ new file mode 100644 index 0000000..58fd295 --- /dev/null +++ b/experiments/gcc-2-multi-source/calculator.c~ @@ -0,0 +1,22 @@ +#include "include/calculator.h" + +int sum(int x, int y) { + return x + y; +} + +int subtract(int x, int y) { + return x - y; +} + +int multiply(int x, int y) { + return x * y; +} + +int divide(int x, int divisor) { + if(divisor != 0) + return x / divisor; + else{ + echo("error:divisor can not be 0\n"); + return -1; + } +} diff --git a/experiments/gcc-2-multi-source/main.c b/experiments/gcc-2-multi-source/main.c index bdbb5b9..966798e 100644 --- a/experiments/gcc-2-multi-source/main.c +++ b/experiments/gcc-2-multi-source/main.c @@ -1,5 +1,5 @@ #include - +#include "include/calculator.h" int main(void) { int x, y; diff --git a/experiments/gcc-2-multi-source/main.c~ b/experiments/gcc-2-multi-source/main.c~ new file mode 100644 index 0000000..bdbb5b9 --- /dev/null +++ b/experiments/gcc-2-multi-source/main.c~ @@ -0,0 +1,12 @@ +#include + +int main(void) { + int x, y; + + x = 2; + y = 3; + + printf("%d + %d = %d\n", x, y, sum(2, 3)); + + return 0; +} diff --git a/experiments/gcc-3-real-project/calculator.c b/experiments/gcc-3-real-project/calculator.c index 391fc7f..d6b9faa 100644 --- a/experiments/gcc-3-real-project/calculator.c +++ b/experiments/gcc-3-real-project/calculator.c @@ -1,4 +1,5 @@ #include "include/calculator.h" +#include int sum(int x, int y) { return x + y; @@ -13,5 +14,10 @@ int multiply(int x, int y) { } int divide(int x, int divisor) { + if(divisor != 0) return x / divisor; + else{ + printf("error:divisor can not be 0\n"); + return -1; + } } diff --git a/experiments/gcc-3-real-project/calculator.c~ b/experiments/gcc-3-real-project/calculator.c~ new file mode 100644 index 0000000..ee59454 --- /dev/null +++ b/experiments/gcc-3-real-project/calculator.c~ @@ -0,0 +1,22 @@ +#include "include/calculator.h" +#include"include.h" +int sum(int x, int y) { + return x + y; +} + +int subtract(int x, int y) { + return x - y; +} + +int multiply(int x, int y) { + return x * y; +} + +int divide(int x, int divisor) { + if(divisor != 0) + return x / divisor; + else{ + printf("error:divisor can not be 0\n"); + return -1; + } +} diff --git a/experiments/gcc-3-real-project/main.c~ b/experiments/gcc-3-real-project/main.c~ new file mode 100644 index 0000000..6798996 --- /dev/null +++ b/experiments/gcc-3-real-project/main.c~ @@ -0,0 +1,14 @@ +#include + +#include "include/calculator.h" + +int main(void) { + int x, y; + + x = 2; + y = 3; + + printf("%d - %d = %d\n", x, y, subtract(2, 3)); + + return 0; +} diff --git a/experiments/gcc-3-real-project/result b/experiments/gcc-3-real-project/result new file mode 100755 index 0000000000000000000000000000000000000000..d16f1ecd4166db100c22c547b0ea6470dc936b9f GIT binary patch literal 8764 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 Date: Thu, 5 May 2016 22:43:40 +0800 Subject: [PATCH 04/12] homework --- experiments/gcc-3-real-project/Makefile | 0 experiments/gcc-3-real-project/{result => main} | Bin experiments/my/wo | 2 -- .../Makefile" | 9 +++++++++ .../calculator.c" | 9 +++++++++ .../calculator.c~" | 9 +++++++++ .../include/calculator.h" | 6 ++++++ .../include/calculator.h~" | 6 ++++++ .../main" | Bin 0 -> 8671 bytes .../main.c" | 14 ++++++++++++++ .../main.c~" | 10 ++++++++++ .../wo~" | 0 12 files changed, 63 insertions(+), 2 deletions(-) mode change 100644 => 100755 experiments/gcc-3-real-project/Makefile rename experiments/gcc-3-real-project/{result => main} (100%) delete mode 100644 experiments/my/wo create mode 100755 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/Makefile" create mode 100644 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c" create mode 100644 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c~" create mode 100644 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h" create mode 100644 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h~" create mode 100755 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main" create mode 100644 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c" create mode 100644 "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c~" rename experiments/my/wo~ => "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/wo~" (100%) diff --git a/experiments/gcc-3-real-project/Makefile b/experiments/gcc-3-real-project/Makefile old mode 100644 new mode 100755 diff --git a/experiments/gcc-3-real-project/result b/experiments/gcc-3-real-project/main similarity index 100% rename from experiments/gcc-3-real-project/result rename to experiments/gcc-3-real-project/main diff --git a/experiments/my/wo b/experiments/my/wo deleted file mode 100644 index 91f47f4..0000000 --- a/experiments/my/wo +++ /dev/null @@ -1,2 +0,0 @@ -abc - diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/Makefile" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/Makefile" new file mode 100755 index 0000000..0531065 --- /dev/null +++ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/Makefile" @@ -0,0 +1,9 @@ +main:main.o calculator.o + gcc main.o calculator.o -o main +main.o:main.c + gcc -c main.c +calculator.o:calculator.c + gcc -c calculator.c + +clean: + rm main *.o diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c" new file mode 100644 index 0000000..facf66c --- /dev/null +++ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c" @@ -0,0 +1,9 @@ +#include "include/calculator.h" + + +int compare(int a,int b){ + if(a>b) + return 1; + else + return 0; +} diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c~" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c~" new file mode 100644 index 0000000..cce2b11 --- /dev/null +++ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/calculator.c~" @@ -0,0 +1,9 @@ +#include "include/calculator.h" + + +bool compare(int a,int b){ + if(a>b) + return true; + else + return false; +} diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h" new file mode 100644 index 0000000..220d1a5 --- /dev/null +++ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h" @@ -0,0 +1,6 @@ +#ifndef _CALC_H +#define _CALC_H + +int compare(int a,int b); + +#endif //_CALC_H diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h~" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h~" new file mode 100644 index 0000000..c664dc7 --- /dev/null +++ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/include/calculator.h~" @@ -0,0 +1,6 @@ +#ifndef _CALC_H +#define _CALC_H + +bool compare(int a,int b); + +#endif //_CALC_H diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main" new file mode 100755 index 0000000000000000000000000000000000000000..294fdabc6edd0ae56e8402e0fdef847a6c3d0d5f GIT binary patch literal 8671 zcmeHMZ){W76~DIgkAF`1v(1IB@ivg4Q`{s3W=adsNenM2{24fORTo~I*dgv5JF=f? z(y2630Lf)ArXh{(Q$9`;leT`?B0e!2ebnJpxXk1ZcP@LK5oH+DSJqi+AAha6)pNfwZ$?O z!Y={RBVX&hk_GLN1*YtWru<<&Vo7ha(%Y=`n9eB2m~#K9Z}g8Sdl9z=j(ClTXqS1B zk}Rb|x6BxoFH)nDY9;g;$qB)f^}Y!`rJ^MMGpSS6hgEw^#pSN*A5+DOr;>@@?JZ9w zV-3kfDmUCP9NgZpy(N%M2byKS$v(;MJ=%YXxREuZ8PgbyCQ?9-52jNJF~r`^j@CA#InW%~29s|2Bik#wbE7h>WdI?$yz z=pg#oyjRcPddb~AH356l@q68qR8_c9TR%$J1aT~XZQcWUJ^!YD?e=cnHKV^hpM&xh z64Xz>W8Ul5^KV)DHz=Ilv0(*0KD!{vVA`ecgwua7H=K z-BbO6+WJ!fgnVA1=R)~H=x9g&eyFP>|86MKd2Z8uwI3lm*Ff}0=aySd@9Eb*^U#Qx zz4ck4pr8KOe1dIs=5KfA@3+H7Vcq-s*py4(aVK}12FeTFp>Kz}L&rkKRDZF}PcVMu z*iu8ug|R-otNCeRW^!@SA5CWC!nMJ(GYJ1^%wI->b>DY~y}t9Fu-AXCBJAD#y-MBNc&1AC2FI%Rd$puD81goTyqjCS{#LIK z@~z$)*>8%+IPBQxJ(+xz9!20$1Rh1;Q3M`E;J-!S5cXG;8WoicGTK5=V!F~|g|9-B zrB#YIt1SL8#q;@UgW~yov|jN(b)KU4C?&4{=fgsp_)Bh$$ikVg(PQznH=s1()`*DZ zGB2K|=o~=FXA$uQMVZikOD1dwDe*hg;)?qS+Fw(ma{{Fa)js3nif6yMJ#6A-Vjiz$ z*`HA*kL`-&T}tk*;!Rbr;Qu?}bF8zWqw2Z#D|$lFGm1Lp_qMe??cdzhn@gEFe@h@3 zXlZE9Nv`Q+Q%j(+CD63R!o?!d=7y#nO4gET79x-x88oB4pk~IR16;y^E1nq=fmGUz z2STkK4QBMX;*O_sf!{wr9#i~_}!^~XJ$tQuGP+)r-b+5b}x zeO~`2lzxx2X06ZkPH^g<2S$F8f0X!r;UlMz_&s28rQbLR%j0j?*VOu>DSdf1V`WhO zj>7b!L!ZBEUQqfs$+#`C9z#Dt!QMW<-%QmZUgud}nPpatD}9dtXq6`GMwR|L$rUrF z{!dXw?X&(xrO)37pDC)!l2iXz4*eOWKf~=i`p?gg&0a-;K7FdkZToI&NjT-5Je^5v zZTkGa_o?rxPI)K)C+L!k+&+Ctq2&LZ`hS5eb(Qt`eaGK(XH@@HI2Oh)kAn}PYj2;w z$IVlxkevQ9&-4yt?D|6OH+Y~1rIljFdQ9&*^n*%2s2pTJ*#he^|0xQDasTP_7bRUO zI^|V3qzq*R{0VC$#+F$BpbeuU>ocWm18&l)3^a_x`STh4#~0yw>aZv@#PEqT)UD7Z&F^rOYxP0*X2@t)xteeDee`# zj+WxJg4f4VybkvvnjMm5k60~uJ+oJO@TH&69i{kM!Rt>cz7Fe2j~$X_4^9odUf3%= z;){aUfl?f&1fJiv3J*>pJa26<#^qy}hdp*kmOYE!iq^cU5PzrXSd!?S>%!MRr~foP z++vluTA`K5(;OlEt^*G#+kzi%|F>+U#=Q07jT)!rl zz^VOm^7Ni@VLaTZ)=(;@KciSKJ|t1j&WBQU&7yJgFKMUDc#r{EJl@s{fT zN#Op)?ug$5U+wk@%@K$92*=KV=R5CPZUd+I2o;~WviT|SI*h|Z4m$-U&-*%dp$dT| zd1oBf04Mu&k3`A3oy7SbxL+cr+1Hi)J4&8qwgRVqIqmOW!p`&3PMP(yFJorS9BxSZ zaAml!?Xc0=aU^0GA{NiYk0-J?>Kf*t(U(l8;#pA!GK^T-IG#-RMw3R&OlPu2G&d}8 zejG~1&3G)ZeaAPp!g3iQgHE#6xzxZ}GczKrlWZ(EI5+|o8)wh~xI~ohIN@?%G})I+ zM$xYHf6w92{;&}~(2fpRz2S0+ftWDbpFa@V-_ZssTaCOv6~^AqgRP-XN5T;! z5^C)XlR0_A+Lz5qzlG5e*>4ns6xrWKA&NwMlW{=@Y3t@yUeaos{r1&}%X7A6#k#(A z2srO@oz*t;j$2;DIh!^HqNy0XFggyxiC7|KWHG0SZ literal 0 HcmV?d00001 diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c" new file mode 100644 index 0000000..94ff2d9 --- /dev/null +++ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c" @@ -0,0 +1,14 @@ +#include + +#include "include/calculator.h" + +int main(void) { + int x,y; + x=3,y=2; + printf("x>2:"); + if(compare(x,y)>0) + printf("true\n"); + else + printf("false\n"); + return 0; +} diff --git "a/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c~" "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c~" new file mode 100644 index 0000000..5bc6fc2 --- /dev/null +++ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/main.c~" @@ -0,0 +1,10 @@ +#include + +#include "include/calculator.h" + +int main(void) { + int x,y; + x=3,y=2; + printf("x>2:",compare(x,y)>0?printf("true\n"):printf("false\n")); + return 0; +} diff --git a/experiments/my/wo~ "b/experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/wo~" similarity index 100% rename from experiments/my/wo~ rename to "experiments/\347\234\237\345\256\236\347\232\204C\351\241\271\347\233\256/wo~" From d9ffefe6193a5ebd972bf045f7fdc66dfc636737 Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Fri, 6 May 2016 22:53:46 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Makefile" | 36 ++++++++++++++++++ .../array.c" | 35 +++++++++++++++++ .../array.c~" | 35 +++++++++++++++++ .../calculator.c" | 17 +++++++++ .../include/array.h" | 8 ++++ .../include/array.h~" | 8 ++++ .../include/calculator.h" | 9 +++++ .../main.c" | 36 ++++++++++++++++++ .../main.c~" | 36 ++++++++++++++++++ .../result" | Bin 0 -> 9086 bytes 10 files changed, 220 insertions(+) create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/Makefile" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c~" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/calculator.c" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h~" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/calculator.h" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c" create mode 100644 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c~" create mode 100755 "experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/result" diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/Makefile" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/Makefile" new file mode 100644 index 0000000..121d85a --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/Makefile" @@ -0,0 +1,36 @@ +result:main array calculator + gcc main.o array.o calculator.o -o result + +main: main_clean main.c + gcc -c -O0 main.c +main_optimize: main_clean main.c + gcc -c -O2 main.c +main_clean: + if [ -e main.o ] ; then rm main.o ; fi + + +calculator:calculator.c + gcc -c calculator.c + +array: array_clean array.c + gcc -c -O0 array.c +array_optimize: array_clean array.c + gcc -c -O2 array.c +array_clean: + if [ -e array.o ] ; then rm array.o ; fi + + +release: main_optimize array_optimize calculator + gcc main.o array.o -o release + +diff: result release + ./result + ./release + +clean: + if [ -e result ] ; then rm result ; fi + + if [ -e release ] ; then rm release ; fi + + rm *.o + diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c" new file mode 100644 index 0000000..8ea86ba --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c" @@ -0,0 +1,35 @@ +#include + +#include "include/array.h" + +#define VECTOR_LENGTH 2048 + +void array_get(int arrayX[VECTOR_LENGTH][VECTOR_LENGTH],int arrayY[VECTOR_LENGTH][VECTOR_LENGTH],int n1,int m1,int n2,int m2){ + int i,j; + for(i = 0 ; i < n1 ; i ++ ) + for(j = 0 ; j < m1; j++ ) + scanf("%d",&arrayX[i][j]); + for(i = 0 ; i < n2 ; i ++ ) + for(j = 0 ; j < m2; j++ ) + scanf("%d",&arrayY[i][j]); +} + +void array_multiply(int vector_a[VECTOR_LENGTH][VECTOR_LENGTH], int vector_b[VECTOR_LENGTH][VECTOR_LENGTH], int vector_c[VECTOR_LENGTH][VECTOR_LENGTH],int n1,int m1,int n2,int m2){ + if(m1!=n2){ + printf("Error!\n"); + return ; + } + int i,j,k; + for(i = 0 ;i < n1; i ++) + for(k = 0 ;k < m2 ; k++) + vector_c[i][k] = 0; + for(i = 0 ; i < n1; i++) + for(j = 0 ; j < m1 ;j++) + for(k = 0;k < m2 ; k++) + vector_c[i][k] += vector_a[i][j]*vector_b[j][k]; +} + + + + + diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c~" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c~" new file mode 100644 index 0000000..56a5784 --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/array.c~" @@ -0,0 +1,35 @@ +#include + +#include "include/array.h" + +#define VECTOR_LENGTH 2048 + +void array_get(int arrayX[VECTOR_LENGTH][VECTOR_LENGTH],int arrayY[VECTOR_LENGTH][VECTOR_LENGTH],int n1,int m1,int n2,int m2){ + int i,j; + for(i = 0 ; i < n1 ; i ++ ) + for(j = 0 ; j < m1; j++ ) + scanf("%d",&arrayX[i][j]); + for(i = 0 ; i < n2 ; i ++ ) + for(j = 0 ; j < m2; j++ ) + scanf("%d",&arrayY[i][j]); +} + +void array_multiply(int vector_a[VECTOR_LENGTH][VECTOR_LENGTH], int vector_b[VECTOR_LENGTH][VECTOR_LENGTH], int vector_c[VECTOR_LENGTH][VECTOR_LENGTH],int n1,int m1,int n2,int m2){ + if(m1!=n2){ + printf("Error!\n"); + return ; + } + int i,j,k; + for(i = 0 ;i < n1; i ++) + for(k = 0 ;k < m2 ; k++) + vector_c[[i][k] = 0; + for(i = 0 ; i < n1; i++) + for(j = 0 ; j < m1 ;j++) + for(k = 0;k < m2 ; k++) + vector_c[i][k] += vector_a[i][j]*vector_b[j][k]; +} + + + + + diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/calculator.c" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/calculator.c" new file mode 100644 index 0000000..391fc7f --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/calculator.c" @@ -0,0 +1,17 @@ +#include "include/calculator.h" + +int sum(int x, int y) { + return x + y; +} + +int subtract(int x, int y) { + return x - y; +} + +int multiply(int x, int y) { + return x * y; +} + +int divide(int x, int divisor) { + return x / divisor; +} diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h" new file mode 100644 index 0000000..e096be4 --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h" @@ -0,0 +1,8 @@ +#ifndef _ARRAY_H +#define _ARRAY_H +#define VECTOR_LENGTH 2048 +void array_get(int arrayX[VECTOR_LENGTH][VECTOR_LENGTH],int arrayY[VECTOR_LENGTH][VECTOR_LENGTH],int n1,int m1,int n2,int m2); + +void array_multiply(int vector_a[VECTOR_LENGTH][VECTOR_LENGTH], int vector_b[VECTOR_LENGTH][VECTOR_LENGTH], int vector_c[VECTOR_LENGTH][VECTOR_LENGTH],int n1,int m1,int n2,int m2); + +#endif diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h~" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h~" new file mode 100644 index 0000000..c15879b --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/array.h~" @@ -0,0 +1,8 @@ +#ifndef _ARRAY_H +#define _ARRAY_H +#define VECTOR_LENGTH 2048 +void array_get(int arrayX[VECTOR_LENGTH][VECTOR_LENGTH],int arrayY[VECTOR_LENGTH][VECTOR_LENGTH]); + +void array_multiply(int vector_a[VECTOR_LENGTH][VECTOR_LENGTH], int vector_b[VECTOR_LENGTH][VECTOR_LENGTH], int vector_c[VECTOR_LENGTH][VECTOR_LENGTH]); + +#endif diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/calculator.h" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/calculator.h" new file mode 100644 index 0000000..a5e00e3 --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/include/calculator.h" @@ -0,0 +1,9 @@ +#ifndef _CALC_H +#define _CALC_H + +int sum(int x, int y); +int subtract(int x, int y); +int multiply(int x, int y); +int divide(int x, int divisor); + +#endif //_CALC_H diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c" new file mode 100644 index 0000000..b9f5cfa --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c" @@ -0,0 +1,36 @@ +#include +#include + +#include "include/calculator.h" + +#include "include/array.h" + +#define VECTOR_LENGTH 2048 + +int n1,m1,n2,m2; + +int main(void) { + + int vector_a[VECTOR_LENGTH][VECTOR_LENGTH], vector_b[VECTOR_LENGTH][VECTOR_LENGTH], vector_c[VECTOR_LENGTH][VECTOR_LENGTH]; + + double time_start, time_end; + + scanf("%d%d%d%d",&n1,&m1,&n2,&m2); + + array_get(vector_a,vector_b,n1,m1,n2,m2); + + time_start = clock(); + + array_multiply(vector_a, vector_b, vector_c,n1,m1,n2,m2); + + time_end = clock(); + + //array_print(vector_c, VECTOR_LENGTH); + + printf("Time used: %10.9f\n", (double) ( (time_end - time_start) / 1000.0) ); + + return 0; +} + + + diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c~" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c~" new file mode 100644 index 0000000..242a682 --- /dev/null +++ "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/main.c~" @@ -0,0 +1,36 @@ +#include +#include + +#include "include/calculator.h" + +#include "include/array.h" + +#define VECTOR_LENGTH 2048 + +int n1,m1,n2,m2; + +int main(void) { + + int vector_a[VECTOR_LENGTH][VECTOR_LENGTH], vector_b[VECTOR_LENGTH][VECTOR_LENGTH], vector_c[VECTOR_LENGTH][VECTOR_LENGTH]; + + double time_start, time_end; + + scanf("%d%d%d%d",&n1,&m1,&n2,&m2); + + array_get(vector_a,vector_b); + + time_start = clock(); + + array_multiply(vector_a, vector_b, vector_c); + + time_end = clock(); + + //array_print(vector_c, VECTOR_LENGTH); + + printf("Time used: %10.9f\n", (double) ( (time_end - time_start) / 1000.0) ); + + return 0; +} + + + diff --git "a/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/result" "b/experiments/\347\274\226\350\257\221\345\231\250\344\274\230\345\214\226\344\275\234\344\270\232/result" new file mode 100755 index 0000000000000000000000000000000000000000..f2bf03d82b921ae3f8230ad0db6007c450387fd1 GIT binary patch literal 9086 zcmeHMZ*WxA6~DWigb@ zt^Lpso$1}#d+zz2Klj}G?w|MW{dTZzjnm-}oSfozL7Y~qNyyBFI5bzX3TqUzg(j{O z3q=`_Qv5Y3A!?SGPAb<-%axuBv;_Y~rwKGVHCbT#B@-4*IYOdTUmuS=hzSd(Y(rJu2rmvXt5!P1MfePVF+CzMxxM){Q=A=mf(3=v<__v`|>7|ad_vXgptWNaVU zv2VcgyzW_cHX3-_^LWQ?DL*2!-uc0K=d>+#?D^M8Rq)i#V*|lSlqXjOPw#yB-?~2YFI{i4x*oN-KDqPde5*8Wm7eW9 zm2F3pf}?2G>x043Rl(QOp2N)ub!=!Vmm8mjju{C~$VN7DYi}G3PFP!eibEPHd6G2q zZS(GYYalp*woR-Gp4@pvIU0W+I;x%H-;-st7cw9nUK#l#6WTla@#a@=syZ^YjB4_JznjPp=1Wc3<|fscdEv z{s%j!9HX1%K(S&s9nIR%DbFjx$zsK+=RSQ5P`BT+=qc(j5x6Ii%?0jm&0Yv}wr1Z7 zbhPbR(o^EY60oO+=%%)t-mCkQK77$dE8*COpXYM=t`F1Kv3*4FqUW#y@=sC zA4BRKW@rQGCD0Dg`RLy?=vP3W1#JO+74%imDU!pMlH<{h!m-`!SXeo$e4k^MmvDMl z>_>geNI|9P^@UgrIq8pnmdo{%uG_oDUA@jT=aKTq#T^S)ExTp$4Fr=8mTggr_$h7? zaC>(pGM%pmdGQ>3ge7mKG`=Q${9wPp4F^*AYadUlmxt57}EN`+sr&Rn{&Lq$Mi5DHoA6If^{$D5j9c!=X ztZLTYybq(j>jw=I$JZ_UK; zl^Tl(KXE;wRFCjSb|m1>r0Jw7c{rL(#rhIOi~(6P8V`|yD)qDk#~cE ztS=HuhlD@cV{|7&y-}kl0$b)x3nP?FhIW`1Tz()7HFyv8#=@w&4-S#}Wi6)1t*Mmo zhx>YaqlvV=m;ZB~<{^za9`B7#4P4)-Fxr1E|RaQvkbEvzSs73)!;wSn!2oEkWM zXDQ$X$(d(9)OP#4z8e^=9c<6*QI}d!!pfeBz5ljAKy#n%dA=W4_Uf1^zuvJP(+6Qs zYYFqbo}5zlwW{JWP;2}O7LTGpeaiOv^-Fa$uUGc|WBe(bJ+Fs8WzXv;+0!0j@4sh& zQCt)sCEh;{DSO@*OsN?wmx*Tax7v@Y^=VYu%Xc}8fmfB8K5MhjpL41PA60(X1=}(I z1DieXcO_~A;&q?(ZSKSYWzYTZtZSJ|(WTp{EBW8?)CsQqlu=Yo7*7-2<4?e+iM zW`9W4e@N9&@7mU6um1>yG)C2M%kS@eerVUX^RL6!W3lJ`zgi7^yS|-21zQS{>!*_n zO1>{>|7YmZ*kgO%|M+~D&vAKta{W9G&cfDOKcAaTQlpSq-{cBBR2b!D%s069)}!*6)8>M7E&ey-&+X@S(fpjQ{zE}P zxzH=TZxrLR1@8yNct!rbw-}$3U%!j-O2O-LFEXKY0dy!&% zuHf~o7@wD4r;70_^4}lD_M5DL?^>+lTt$P75eHJzW6z#U?)=&ICE zDx`N%oUY$UV>&;7m8SD98$agyc=Uq0R*1Wx|DW^2;m3T2j-c(D)Sb_4ff+}g+Io*DEHDE}#& z|AP|0e7^r=20z2Vsl9aDK#ALXd@VSDI+f1g1Urn|(RIxmjkeZJ9flzy z(PVU6EQO;0Bi(D@UNsR-iD@9ii1ZoT;(c2~aU+uMOQwuaX1l=mb$>jXjz;{;SKM|B zJWr!!(3igX-EQDpJh?-dU;2?uZ|@G6SU7_Y2#QqcIu{|!69CX~C?3wlL#SW2W6j1u zd(a53Z$U%MR&lw=QA8LmUtb?+Z*7K_MIvvEg|W76LsOv5*sx~JreKHB5ol@)k~?{+ z98P6q{31~=jMk2JqtIU+?akC%9igr9sGu_k^S)X1X5#5se|(3$sn#^Ue5NaBBP!1( zcL z-BE}{9ebw+Qx}(@>Si8+MV;J>C}nK_1dgmz&;S4c literal 0 HcmV?d00001 From 515288da9e2b24c867413a990c0ab823360b61d8 Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Mon, 23 May 2016 17:03:45 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9addUsers.sh=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=AC=AC=E4=B8=80=E8=A1=8C?= =?UTF-8?q?=E5=BA=94=E6=9C=89=E7=9A=84=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assignments/shell/AddUsers/addUsers.sh | 2 +- assignments/shell/AddUsers/addUsers.sh~ | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 assignments/shell/AddUsers/addUsers.sh~ diff --git a/assignments/shell/AddUsers/addUsers.sh b/assignments/shell/AddUsers/addUsers.sh index 731563e..7eec03f 100644 --- a/assignments/shell/AddUsers/addUsers.sh +++ b/assignments/shell/AddUsers/addUsers.sh @@ -1,4 +1,4 @@ -# +#!/bin/bash # # useradd # chpasswd diff --git a/assignments/shell/AddUsers/addUsers.sh~ b/assignments/shell/AddUsers/addUsers.sh~ new file mode 100644 index 0000000..731563e --- /dev/null +++ b/assignments/shell/AddUsers/addUsers.sh~ @@ -0,0 +1,9 @@ +# +# +# useradd +# chpasswd +# chown +# chmod +# edquota +# + From 38454184b0ef577172c2fd1f1afab278767c2dd3 Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Mon, 23 May 2016 17:10:31 +0800 Subject: [PATCH 07/12] cxp --- assignments/shell/AddUsers/addUsers.sh | 1 + assignments/shell/AddUsers/addUsers.sh~ | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assignments/shell/AddUsers/addUsers.sh b/assignments/shell/AddUsers/addUsers.sh index 7eec03f..88bb792 100644 --- a/assignments/shell/AddUsers/addUsers.sh +++ b/assignments/shell/AddUsers/addUsers.sh @@ -1,3 +1,4 @@ + #!/bin/bash # # useradd diff --git a/assignments/shell/AddUsers/addUsers.sh~ b/assignments/shell/AddUsers/addUsers.sh~ index 731563e..7eec03f 100644 --- a/assignments/shell/AddUsers/addUsers.sh~ +++ b/assignments/shell/AddUsers/addUsers.sh~ @@ -1,4 +1,4 @@ -# +#!/bin/bash # # useradd # chpasswd From 4f9f63b5a078457ed0b9af78c27aaacc7a4d9d8e Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Mon, 23 May 2016 17:14:13 +0800 Subject: [PATCH 08/12] cxp --- assignments/shell/AddUsers/addUsers.sh | 1 + assignments/shell/AddUsers/addUsers.sh~ | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/assignments/shell/AddUsers/addUsers.sh b/assignments/shell/AddUsers/addUsers.sh index 7eec03f..88bb792 100644 --- a/assignments/shell/AddUsers/addUsers.sh +++ b/assignments/shell/AddUsers/addUsers.sh @@ -1,3 +1,4 @@ + #!/bin/bash # # useradd diff --git a/assignments/shell/AddUsers/addUsers.sh~ b/assignments/shell/AddUsers/addUsers.sh~ index 731563e..7eec03f 100644 --- a/assignments/shell/AddUsers/addUsers.sh~ +++ b/assignments/shell/AddUsers/addUsers.sh~ @@ -1,4 +1,4 @@ -# +#!/bin/bash # # useradd # chpasswd From 4f2800c4809fef798dceb999421de6865a169f1c Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Mon, 23 May 2016 17:16:12 +0800 Subject: [PATCH 09/12] haha --- assignments/shell/AddUsers/addUsers.sh | 1 - assignments/shell/AddUsers/addUsers.sh~ | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assignments/shell/AddUsers/addUsers.sh b/assignments/shell/AddUsers/addUsers.sh index 88bb792..7eec03f 100644 --- a/assignments/shell/AddUsers/addUsers.sh +++ b/assignments/shell/AddUsers/addUsers.sh @@ -1,4 +1,3 @@ - #!/bin/bash # # useradd diff --git a/assignments/shell/AddUsers/addUsers.sh~ b/assignments/shell/AddUsers/addUsers.sh~ index 7eec03f..88bb792 100644 --- a/assignments/shell/AddUsers/addUsers.sh~ +++ b/assignments/shell/AddUsers/addUsers.sh~ @@ -1,3 +1,4 @@ + #!/bin/bash # # useradd From 2abd005a6f35923a483e6f967e517ef87e8db84e Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Mon, 23 May 2016 17:34:41 +0800 Subject: [PATCH 10/12] haha --- assignments/shell/AddUsers/addUsers.sh | 2 +- assignments/shell/AddUsers/addUsers.sh~ | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/assignments/shell/AddUsers/addUsers.sh b/assignments/shell/AddUsers/addUsers.sh index 7eec03f..9778fbd 100644 --- a/assignments/shell/AddUsers/addUsers.sh +++ b/assignments/shell/AddUsers/addUsers.sh @@ -6,4 +6,4 @@ # chmod # edquota # - +#echo diff --git a/assignments/shell/AddUsers/addUsers.sh~ b/assignments/shell/AddUsers/addUsers.sh~ index 88bb792..7eec03f 100644 --- a/assignments/shell/AddUsers/addUsers.sh~ +++ b/assignments/shell/AddUsers/addUsers.sh~ @@ -1,4 +1,3 @@ - #!/bin/bash # # useradd From 0087e702a03fa13df852d4db88326d913bea0ba8 Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Sun, 29 May 2016 10:21:59 +0800 Subject: [PATCH 11/12] cxptest --- ...se a common code repo to pivot quickly.srt | 615 +++++++++--------- ...e a common code repo to pivot quickly.srt~ | 44 +- 2 files changed, 350 insertions(+), 309 deletions(-) diff --git a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt index 3b095d0..8e81d36 100644 --- a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt +++ b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt @@ -1,48 +1,49 @@ b -1 -00:00:00,000 --> 00:00:04,950 -[MUSIC PLAYING] STEFAN RITTER: Hi guys. - -2 -00:00:04,950 --> 00:00:07,770 -I'm Stefan, and I'm working on multiple projects at the moment. - -3 -00:00:07,770 --> 00:00:12,240 -One is buzzr.io, one is fitguru.org, and one is pickfeed.io. - -4 -00:00:12,240 --> 00:00:17,830 -And today I'm going to talk about how I use a common code base to pivot to all these different ideas. - -5 -00:00:17,830 --> 00:00:23,300 -While working on different startup ideas, I quickly realized there are common parts to each idea. -当研究不同的创业想法时，我很快意识到他们有共同的部分。 -6 -00:00:23,300 --> 00:00:29,320 -So I created an abstraction called emptyApp, which combines these five features that I singled out. - -7 -00:00:29,320 --> 00:00:52,720 -The five features are a landing page with an email sign up so you can go online right away and start collecting emails from people who are interested, a client-agnostic API server that doesn't care if the front-end is a web app or a mobile app, and then a front-end app, which for me usually is the web app, since I think the web is the biggest [INAUDIBLE] platform, and then a user model, since you need to save your users. -这五个特性是一个电子邮件注册的网页,这样你就可以立即上网,开始收集感兴趣的人的电子邮件,用一个API服务器（不在乎前端是一个移动web应用程序或应用程序与否）,然后前端应用程序,这对我来说通常是web应用程序,因为我觉得网络是最大的[全场寂静]平台,然后一个用户模型,因为您需要保存你的用户。 - -8 -00:00:52,720 --> 00:00:57,560 -And the fifth thing would be a login authentication scheme with Twitter, Facebook, G+, or email. - -9 -00:00:57,560 --> 00:01:02,550 -Let's look at the five features in emptyApp as they come from the repo when your freshly install it. - -10 -00:01:02,550 --> 00:01:12,710 -So this is emptyApp's landing page where you can collect users' email addresses who might be interested until you launch. -所以这是emptyapp着陆页，在这里您可以收集用户的电子邮件地址的人会感兴趣，直到你发射。 - -11 -00:01:12,710 --> 00:01:24,640 +1 +00:00:00,000 --> 00:00:04,950 +[MUSIC PLAYING] STEFAN RITTER: Hi guys. + +2 +00:00:04,950 --> 00:00:07,770 +I'm Stefan, and I'm working on multiple projects at the moment. +我叫斯蒂芬，此时我在工作。 + +3 +00:00:07,770 --> 00:00:12,240 +One is buzzr.io, one is fitguru.org, and one is pickfeed.io. + +4 +00:00:12,240 --> 00:00:17,830 +And today I'm going to talk about how I use a common code base to pivot to all these different ideas. + +5 +00:00:17,830 --> 00:00:23,300 +While working on different startup ideas, I quickly realized there are common parts to each idea. +当研究不同的创业想法时，我很快意识到他们有共同的部分。 +6 +00:00:23,300 --> 00:00:29,320 +So I created an abstraction called emptyApp, which combines these five features that I singled out. + +7 +00:00:29,320 --> 00:00:52,720 +The five features are a landing page with an email sign up so you can go online right away and start collecting emails from people who are interested, a client-agnostic API server that doesn't care if the front-end is a web app or a mobile app, and then a front-end app, which for me usually is the web app, since I think the web is the biggest [INAUDIBLE] platform, and then a user model, since you need to save your users. +这五个特性是一个电子邮件注册的网页,这样你就可以立即上网,开始收集感兴趣的人的电子邮件,用一个API服务器（不在乎前端是一个移动web应用程序或应用程序与否）,然后前端应用程序,这对我来说通常是web应用程序,因为我觉得网络是最大的[全场寂静]平台,然后一个用户模型,因为您需要保存你的用户。 + +8 +00:00:52,720 --> 00:00:57,560 +And the fifth thing would be a login authentication scheme with Twitter, Facebook, G+, or email. + +9 +00:00:57,560 --> 00:01:02,550 +Let's look at the five features in emptyApp as they come from the repo when your freshly install it. + +10 +00:01:02,550 --> 00:01:12,710 +So this is emptyApp's landing page where you can collect users' email addresses who might be interested until you launch. +所以这是emptyapp着陆页，在这里您可以收集用户的电子邮件地址的人会感兴趣，直到你发射。 + +11 +00:01:12,710 --> 00:01:24,640 So if you just enter an email address here, you can link it up to a Mailchimp list and collect email addresses that way. 不会翻译 A @@ -60,268 +61,268 @@ B B A A - - -12 -00:01:24,640 --> 00:01:29,530 -But then emptyApp also gives you real login functionality. -但是emptyApp也赋予了你真正的登录功能 - -13 -00:01:29,530 --> 00:01:42,980 -So for example, if we try to log on like this, this user doesn't exist. - -14 -00:01:42,980 --> 00:01:45,660 -So obviously we get an error message. - -15 -00:01:45,660 --> 00:01:56,210 -But then if we go to Join, we can create this user. -(但是如果我们加入，就能创建这个用户.） - -16 -00:01:56,210 --> 00:01:58,340 -And then now you're logged in. - -17 -00:01:58,340 --> 00:02:04,130 -So if we try to go back to the homepage, emptyApp will automatically log you back in. - -18 -00:02:04,130 --> 00:02:06,950 -And you're landing on the logged in home page. - -19 -00:02:06,950 --> 00:02:09,474 -There's also a logged out future. - -20 -00:02:09,474 --> 00:02:13,680 -So you can just log out again, and you're back logged out on the home page. - -21 -00:02:13,680 --> 00:02:18,010 -And then, of course, you can do all this as well with all the social media logins. - -22 -00:02:18,010 --> 00:02:19,426 -So here we have Twitter activated. - -23 -00:02:19,426 --> 00:02:27,857 -And then we log back in. - -24 -00:02:27,857 --> 00:02:30,440 -All right, now I'm going to show you these features in action. -没关系，我现在示范一下。 - -25 -00:02:30,440 --> 00:02:40,450 -So if we go to buzzr.io, you can see when you first land on the app there's a landing page. -所以如果我们去buzzr.io，你可以看到你第一次打开app的页面 - -26 -00:02:40,450 --> 00:02:46,400 -But then over here you see we have links to the Join, links to the Login. - -27 -00:02:46,400 --> 00:02:48,945 -And once we're here, we can log in with our user account. -一旦我们加入，我们可以用自己的用户名登录。 - -28 -00:02:48,945 --> 00:02:58,700 -我们登陆登录使用的主页。 -And we land on the logged in home page. - -29 -00:02:58,700 --> 00:03:02,930 -All right, now let me show you what the emptyApp looks like on GitHub. - -30 -00:03:02,930 --> 00:03:14,862 -So if you go to my username, stefanritter/emptyapp-- so there's a link right here so you can download and clone the app. - -31 -00:03:14,862 --> 00:03:17,070 -There are little instructions on how to do the setup. -这里有一些如何安装的说明。 - -32 -00:03:17,070 --> 00:03:25,920 -So it comes with a Grunt file, as well as scripts to do the testing and a supervisor script to watch for server changes. - -33 -00:03:25,920 --> 00:03:34,930 -So if you download the app, and then you want to start it, what you do is you CD into the emptyApp directory. - -34 -00:03:34,930 --> 00:03:37,960 -And then you just run the start script. + + +12 +00:01:24,640 --> 00:01:29,530 +But then emptyApp also gives you real login functionality. +但是emptyApp也赋予了你真正的登录功能 + +13 +00:01:29,530 --> 00:01:42,980 +So for example, if we try to log on like this, this user doesn't exist. + +14 +00:01:42,980 --> 00:01:45,660 +So obviously we get an error message. + +15 +00:01:45,660 --> 00:01:56,210 +But then if we go to Join, we can create this user. +(但是如果我们加入，就能创建这个用户.） + +16 +00:01:56,210 --> 00:01:58,340 +And then now you're logged in. + +17 +00:01:58,340 --> 00:02:04,130 +So if we try to go back to the homepage, emptyApp will automatically log you back in. + +18 +00:02:04,130 --> 00:02:06,950 +And you're landing on the logged in home page. + +19 +00:02:06,950 --> 00:02:09,474 +There's also a logged out future. + +20 +00:02:09,474 --> 00:02:13,680 +So you can just log out again, and you're back logged out on the home page. + +21 +00:02:13,680 --> 00:02:18,010 +And then, of course, you can do all this as well with all the social media logins. + +22 +00:02:18,010 --> 00:02:19,426 +So here we have Twitter activated. + +23 +00:02:19,426 --> 00:02:27,857 +And then we log back in. + +24 +00:02:27,857 --> 00:02:30,440 +All right, now I'm going to show you these features in action. +没关系，我现在示范一下。 + +25 +00:02:30,440 --> 00:02:40,450 +So if we go to buzzr.io, you can see when you first land on the app there's a landing page. +所以如果我们去buzzr.io，你可以看到你第一次打开app的页面 + +26 +00:02:40,450 --> 00:02:46,400 +But then over here you see we have links to the Join, links to the Login. + +27 +00:02:46,400 --> 00:02:48,945 +And once we're here, we can log in with our user account. +一旦我们加入，我们可以用自己的用户名登录。 + +28 +00:02:48,945 --> 00:02:58,700 +我们登陆登录使用的主页。 +And we land on the logged in home page. + +29 +00:02:58,700 --> 00:03:02,930 +All right, now let me show you what the emptyApp looks like on GitHub. + +30 +00:03:02,930 --> 00:03:14,862 +So if you go to my username, stefanritter/emptyapp-- so there's a link right here so you can download and clone the app. + +31 +00:03:14,862 --> 00:03:17,070 +There are little instructions on how to do the setup. +这里有一些如何安装的说明。 + +32 +00:03:17,070 --> 00:03:25,920 +So it comes with a Grunt file, as well as scripts to do the testing and a supervisor script to watch for server changes. + +33 +00:03:25,920 --> 00:03:34,930 +So if you download the app, and then you want to start it, what you do is you CD into the emptyApp directory. + +34 +00:03:34,930 --> 00:03:37,960 +And then you just run the start script. 然后你就可以运行你的开始脚本了。 - -35 -00:03:37,960 --> 00:03:43,870 -And what it will do is start all the tests, the Grunt watching. - -36 -00:03:43,870 --> 00:03:52,140 -And from that point on, you can demo the app on your local host. - -37 -00:03:52,140 --> 00:03:56,130 -It's a MongoDB database, so the whole app is written in JavaScript. - -38 -00:03:56,130 --> 00:03:58,460 -All my apps are written 100% in JavaScript. - -39 -00:03:58,460 --> 00:04:03,120 -Because you can use JavaScript on the front-end, on the back-end, as well as to talk to your database. - -40 -00:04:03,120 --> 00:04:05,570 -So there's less mental overhead. - -41 -00:04:05,570 --> 00:04:08,410 -For the database, I use MongoDB. -对于数据库，我使用MongoDB - -42 -00:04:08,410 --> 00:04:16,779 -MongoDB is schemaless, so you can change fields on models very quickly, which is very important when you're pivoting between extreme different ideas. - -43 -00:04:16,779 --> 00:04:20,589 -For the front-end, I use AngularJS, which has awesome dependency injection. - -44 -00:04:20,589 --> 00:04:27,310 -So it's very easy to throw around features within your app-- also, again, important when you're changing and pivoting ideas. -所以抛去特征是非常容易的，后面的不懂了。。。 - -45 -00:04:27,310 --> 00:04:33,870 -And then for the server, I use Happy.js, which is a server built specifically for being an API server. -[zhe ge mei you han yu.] - -46 -00:04:33,870 --> 00:04:38,810 -So it's very great to be a front-end-agnostic server back-end. - -47 -00:04:38,810 --> 00:04:39,860 -This is the Grunt task. + +35 +00:03:37,960 --> 00:03:43,870 +And what it will do is start all the tests, the Grunt watching. + +36 +00:03:43,870 --> 00:03:52,140 +And from that point on, you can demo the app on your local host. + +37 +00:03:52,140 --> 00:03:56,130 +It's a MongoDB database, so the whole app is written in JavaScript. + +38 +00:03:56,130 --> 00:03:58,460 +All my apps are written 100% in JavaScript. + +39 +00:03:58,460 --> 00:04:03,120 +Because you can use JavaScript on the front-end, on the back-end, as well as to talk to your database. + +40 +00:04:03,120 --> 00:04:05,570 +So there's less mental overhead. + +41 +00:04:05,570 --> 00:04:08,410 +For the database, I use MongoDB. +对于数据库，我使用MongoDB + +42 +00:04:08,410 --> 00:04:16,779 +MongoDB is schemaless, so you can change fields on models very quickly, which is very important when you're pivoting between extreme different ideas. + +43 +00:04:16,779 --> 00:04:20,589 +For the front-end, I use AngularJS, which has awesome dependency injection. + +44 +00:04:20,589 --> 00:04:27,310 +So it's very easy to throw around features within your app-- also, again, important when you're changing and pivoting ideas. +所以抛去特征是非常容易的，后面的不懂了。。。 + +45 +00:04:27,310 --> 00:04:33,870 +And then for the server, I use Happy.js, which is a server built specifically for being an API server. +[zhe ge mei you han yu.] + +46 +00:04:33,870 --> 00:04:38,810 +So it's very great to be a front-end-agnostic server back-end. + +47 +00:04:38,810 --> 00:04:39,860 +This is the Grunt task. 这是Grunt的任务。 - -48 -00:04:39,860 --> 00:04:46,610 -The Grunt task just watches for file changes and checks the code and tells you if something's wrong and runs all your tests. -我看不懂，不会翻译。 - -49 -00:04:46,610 --> 00:04:51,710 -This is the Karma tab, which runs all the front-end tasks. -这是Karma标签，它执行所有的前置任务. - -50 -00:04:51,710 --> 00:04:57,970 -And then this is the Server tab, which watches for changes in server code and restarts the server if it finds any. -然后，这是．．．．不懂了 - -51 -00:04:57,970 --> 00:05:01,870 -This is what the folder structure looks like of the code. - -52 -00:05:01,870 --> 00:05:04,364 -There are three main folders for you to watch out for. - -53 -00:05:04,364 --> 00:05:07,870 -There is the Client folder, the Server folder, and the Test folder. - -54 -00:05:07,870 --> 00:05:11,187 -It's quite self explanatory what each includes. - -55 -00:05:11,187 --> 00:05:15,270 -But it's important to point out that the client and the server are completely separate. - -56 -00:05:15,270 --> 00:05:23,085 -So this is the client-agnostic API server I talked about previously where the client could be, in this case, an AngularJS app. -所以这是客户无关的API服务器我谈到以前在客户的可能，在这种情况下，一个AngularJS应用。 - -57 -00:05:23,085 --> 00:05:29,330 -But it could also just be an iOS app or an Android app that talks to your server. -但是只有在ios或Android系统上与你的服务器相交互 - -58 -00:05:29,330 --> 00:05:43,710 -And so what happens is if you change something here, Grunt will monitor the change, and then build the front-end code again and inject it into the server. -所以如果你改动了这儿的什么，Grunt会监视变动，然后重建前端代码，把它添加到服务器里。 - -59 -00:05:43,710 --> 00:05:47,232 -So the server will serve the updated app for you. - -60 -00:05:47,232 --> 00:05:49,440 -So the other thing we talked about is the user model. - -61 -00:05:49,440 --> 00:05:56,710 -So if you look into the Server folder, you can see it comes with just one model, which is the user. -所以如果你看看服务器文件夹，你可以看到它只是一个模型，这是用户的。 - -62 -00:05:56,710 --> 00:06:03,239 -The user model comes with just the basic things you need, like username, display name, email, [INAUDIBLE], and passwords. - -63 -00:06:03,239 --> 00:06:04,780 -The controllers are also very simple. - -64 -00:06:04,780 --> 00:06:09,550 -Their authentication controller handles all the login stuff that we previously looked at. -在他们的身份验证控制器处理完所以东西之前，我们就看着。 - -65 -00:06:09,550 --> 00:06:14,400 -There's a feed controller that simply serves the logged in homepage. - -66 -00:06:14,400 --> 00:06:16,670 -There's also a little bonus here. - -67 -00:06:16,670 --> 00:06:18,970 -For real time chatting, there's a Socket.IO set up. - -68 -00:06:18,970 --> 00:06:29,580 -So under Config, there's a little Socket.IO setup where you can then send real time messages back and forth to your clients. - -69 -00:06:29,580 --> 00:06:33,559 -And so this is how I use my common code base to create all these different ideas. - -70 -00:06:33,559 --> 00:06:34,850 -You can check it out on GitHub. - -71 -00:06:34,850 --> 00:06:37,670 -It's on my user name, and then the repo is called emptyApp. - -72 -00:06:37,670 --> 00:06:39,510 -Thanks for watching. + +48 +00:04:39,860 --> 00:04:46,610 +The Grunt task just watches for file changes and checks the code and tells you if something's wrong and runs all your tests. +我看不懂，不会翻译。 + +49 +00:04:46,610 --> 00:04:51,710 +This is the Karma tab, which runs all the front-end tasks. +这是Karma标签，它执行所有的前置任务. + +50 +00:04:51,710 --> 00:04:57,970 +And then this is the Server tab, which watches for changes in server code and restarts the server if it finds any. +然后，这是．．．．不懂了 + +51 +00:04:57,970 --> 00:05:01,870 +This is what the folder structure looks like of the code. + +52 +00:05:01,870 --> 00:05:04,364 +There are three main folders for you to watch out for. + +53 +00:05:04,364 --> 00:05:07,870 +There is the Client folder, the Server folder, and the Test folder. + +54 +00:05:07,870 --> 00:05:11,187 +It's quite self explanatory what each includes. + +55 +00:05:11,187 --> 00:05:15,270 +But it's important to point out that the client and the server are completely separate. + +56 +00:05:15,270 --> 00:05:23,085 +So this is the client-agnostic API server I talked about previously where the client could be, in this case, an AngularJS app. +所以这是客户无关的API服务器我谈到以前在客户的可能，在这种情况下，一个AngularJS应用。 + +57 +00:05:23,085 --> 00:05:29,330 +But it could also just be an iOS app or an Android app that talks to your server. +但是只有在ios或Android系统上与你的服务器相交互 + +58 +00:05:29,330 --> 00:05:43,710 +And so what happens is if you change something here, Grunt will monitor the change, and then build the front-end code again and inject it into the server. +所以如果你改动了这儿的什么，Grunt会监视变动，然后重建前端代码，把它添加到服务器里。 + +59 +00:05:43,710 --> 00:05:47,232 +So the server will serve the updated app for you. + +60 +00:05:47,232 --> 00:05:49,440 +So the other thing we talked about is the user model. + +61 +00:05:49,440 --> 00:05:56,710 +So if you look into the Server folder, you can see it comes with just one model, which is the user. +所以如果你看看服务器文件夹，你可以看到它只是一个模型，这是用户的。 + +62 +00:05:56,710 --> 00:06:03,239 +The user model comes with just the basic things you need, like username, display name, email, [INAUDIBLE], and passwords. + +63 +00:06:03,239 --> 00:06:04,780 +The controllers are also very simple. + +64 +00:06:04,780 --> 00:06:09,550 +Their authentication controller handles all the login stuff that we previously looked at. +在他们的身份验证控制器处理完所以东西之前，我们就看着。 + +65 +00:06:09,550 --> 00:06:14,400 +There's a feed controller that simply serves the logged in homepage. + +66 +00:06:14,400 --> 00:06:16,670 +There's also a little bonus here. + +67 +00:06:16,670 --> 00:06:18,970 +For real time chatting, there's a Socket.IO set up. + +68 +00:06:18,970 --> 00:06:29,580 +So under Config, there's a little Socket.IO setup where you can then send real time messages back and forth to your clients. + +69 +00:06:29,580 --> 00:06:33,559 +And so this is how I use my common code base to create all these different ideas. + +70 +00:06:33,559 --> 00:06:34,850 +You can check it out on GitHub. + +71 +00:06:34,850 --> 00:06:37,670 +It's on my user name, and then the repo is called emptyApp. + +72 +00:06:37,670 --> 00:06:39,510 +Thanks for watching. diff --git a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ index 1d8082c..3b095d0 100644 --- a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ +++ b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ @@ -1,3 +1,4 @@ +b 1 00:00:00,000 --> 00:00:04,950 [MUSIC PLAYING] STEFAN RITTER: Hi guys. @@ -17,7 +18,7 @@ And today I'm going to talk about how I use a common code base to pivot to all 5 00:00:17,830 --> 00:00:23,300 While working on different startup ideas, I quickly realized there are common parts to each idea. - +当研究不同的创业想法时，我很快意识到他们有共同的部分。 6 00:00:23,300 --> 00:00:29,320 So I created an abstraction called emptyApp, which combines these five features that I singled out. @@ -25,6 +26,7 @@ So I created an abstraction called emptyApp, which combines these five features 7 00:00:29,320 --> 00:00:52,720 The five features are a landing page with an email sign up so you can go online right away and start collecting emails from people who are interested, a client-agnostic API server that doesn't care if the front-end is a web app or a mobile app, and then a front-end app, which for me usually is the web app, since I think the web is the biggest [INAUDIBLE] platform, and then a user model, since you need to save your users. +这五个特性是一个电子邮件注册的网页,这样你就可以立即上网,开始收集感兴趣的人的电子邮件,用一个API服务器（不在乎前端是一个移动web应用程序或应用程序与否）,然后前端应用程序,这对我来说通常是web应用程序,因为我觉得网络是最大的[全场寂静]平台,然后一个用户模型,因为您需要保存你的用户。 8 00:00:52,720 --> 00:00:57,560 @@ -37,14 +39,33 @@ Let's look at the five features in emptyApp as they come from the repo when you 10 00:01:02,550 --> 00:01:12,710 So this is emptyApp's landing page where you can collect users' email addresses who might be interested until you launch. +所以这是emptyapp着陆页，在这里您可以收集用户的电子邮件地址的人会感兴趣，直到你发射。 11 00:01:12,710 --> 00:01:24,640 -So if you just enter an email address here, you can link it up to a Mailchimp list and collect email addresses that way. +So if you just enter an email address here, you can link it up to a Mailchimp list and collect email addresses that way. +不会翻译 +A +A +A +B +B +B +B +B +B +B +B +B +B +A +A + 12 00:01:24,640 --> 00:01:29,530 But then emptyApp also gives you real login functionality. +但是emptyApp也赋予了你真正的登录功能 13 00:01:29,530 --> 00:01:42,980 @@ -57,6 +78,7 @@ So obviously we get an error message. 15 00:01:45,660 --> 00:01:56,210 But then if we go to Join, we can create this user. +(但是如果我们加入，就能创建这个用户.） 16 00:01:56,210 --> 00:01:58,340 @@ -93,10 +115,12 @@ And then we log back in. 24 00:02:27,857 --> 00:02:30,440 All right, now I'm going to show you these features in action. +没关系，我现在示范一下。 25 00:02:30,440 --> 00:02:40,450 So if we go to buzzr.io, you can see when you first land on the app there's a landing page. +所以如果我们去buzzr.io，你可以看到你第一次打开app的页面 26 00:02:40,450 --> 00:02:46,400 @@ -105,9 +129,11 @@ But then over here you see we have links to the Join, links to the Login. 27 00:02:46,400 --> 00:02:48,945 And once we're here, we can log in with our user account. +一旦我们加入，我们可以用自己的用户名登录。 28 00:02:48,945 --> 00:02:58,700 +我们登陆登录使用的主页。 And we land on the logged in home page. 29 @@ -121,6 +147,7 @@ So if you go to my username, stefanritter/emptyapp-- so there's a link right he 31 00:03:14,862 --> 00:03:17,070 There are little instructions on how to do the setup. +这里有一些如何安装的说明。 32 00:03:17,070 --> 00:03:25,920 @@ -133,6 +160,7 @@ So if you download the app, and then you want to start it, what you do is you C 34 00:03:34,930 --> 00:03:37,960 And then you just run the start script. +然后你就可以运行你的开始脚本了。 35 00:03:37,960 --> 00:03:43,870 @@ -161,6 +189,7 @@ So there's less mental overhead. 41 00:04:05,570 --> 00:04:08,410 For the database, I use MongoDB. +对于数据库，我使用MongoDB 42 00:04:08,410 --> 00:04:16,779 @@ -173,10 +202,12 @@ For the front-end, I use AngularJS, which has awesome dependency injection. 44 00:04:20,589 --> 00:04:27,310 So it's very easy to throw around features within your app-- also, again, important when you're changing and pivoting ideas. +所以抛去特征是非常容易的，后面的不懂了。。。 45 00:04:27,310 --> 00:04:33,870 And then for the server, I use Happy.js, which is a server built specifically for being an API server. +[zhe ge mei you han yu.] 46 00:04:33,870 --> 00:04:38,810 @@ -185,18 +216,22 @@ So it's very great to be a front-end-agnostic server back-end. 47 00:04:38,810 --> 00:04:39,860 This is the Grunt task. +这是Grunt的任务。 48 00:04:39,860 --> 00:04:46,610 The Grunt task just watches for file changes and checks the code and tells you if something's wrong and runs all your tests. +我看不懂，不会翻译。 49 00:04:46,610 --> 00:04:51,710 This is the Karma tab, which runs all the front-end tasks. +这是Karma标签，它执行所有的前置任务. 50 00:04:51,710 --> 00:04:57,970 And then this is the Server tab, which watches for changes in server code and restarts the server if it finds any. +然后，这是．．．．不懂了 51 00:04:57,970 --> 00:05:01,870 @@ -221,14 +256,17 @@ But it's important to point out that the client and the server are completely s 56 00:05:15,270 --> 00:05:23,085 So this is the client-agnostic API server I talked about previously where the client could be, in this case, an AngularJS app. +所以这是客户无关的API服务器我谈到以前在客户的可能，在这种情况下，一个AngularJS应用。 57 00:05:23,085 --> 00:05:29,330 But it could also just be an iOS app or an Android app that talks to your server. +但是只有在ios或Android系统上与你的服务器相交互 58 00:05:29,330 --> 00:05:43,710 And so what happens is if you change something here, Grunt will monitor the change, and then build the front-end code again and inject it into the server. +所以如果你改动了这儿的什么，Grunt会监视变动，然后重建前端代码，把它添加到服务器里。 59 00:05:43,710 --> 00:05:47,232 @@ -241,6 +279,7 @@ So the other thing we talked about is the user model. 61 00:05:49,440 --> 00:05:56,710 So if you look into the Server folder, you can see it comes with just one model, which is the user. +所以如果你看看服务器文件夹，你可以看到它只是一个模型，这是用户的。 62 00:05:56,710 --> 00:06:03,239 @@ -253,6 +292,7 @@ The controllers are also very simple. 64 00:06:04,780 --> 00:06:09,550 Their authentication controller handles all the login stuff that we previously looked at. +在他们的身份验证控制器处理完所以东西之前，我们就看着。 65 00:06:09,550 --> 00:06:14,400 From 489e9a928bfc2d0c1d92e3cdbb7180263998b57d Mon Sep 17 00:00:00 2001 From: chenxianpeng <645978907@qq.com> Date: Sun, 29 May 2016 10:32:20 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...se a common code repo to pivot quickly.srt | 1 + ...e a common code repo to pivot quickly.srt~ | 615 +++++++++--------- 2 files changed, 309 insertions(+), 307 deletions(-) diff --git a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt index 8e81d36..59a899e 100644 --- a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt +++ b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt @@ -2,6 +2,7 @@ b 1 00:00:00,000 --> 00:00:04,950 [MUSIC PLAYING] STEFAN RITTER: Hi guys. +[背景音乐] STEFAN RITTER: 大家好。 2 00:00:04,950 --> 00:00:07,770 diff --git a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ index 3b095d0..8e81d36 100644 --- a/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ +++ b/final-test/git_workflow/How I- Use a common code repo to pivot quickly.srt~ @@ -1,48 +1,49 @@ b -1 -00:00:00,000 --> 00:00:04,950 -[MUSIC PLAYING] STEFAN RITTER: Hi guys. - -2 -00:00:04,950 --> 00:00:07,770 -I'm Stefan, and I'm working on multiple projects at the moment. - -3 -00:00:07,770 --> 00:00:12,240 -One is buzzr.io, one is fitguru.org, and one is pickfeed.io. - -4 -00:00:12,240 --> 00:00:17,830 -And today I'm going to talk about how I use a common code base to pivot to all these different ideas. - -5 -00:00:17,830 --> 00:00:23,300 -While working on different startup ideas, I quickly realized there are common parts to each idea. -当研究不同的创业想法时，我很快意识到他们有共同的部分。 -6 -00:00:23,300 --> 00:00:29,320 -So I created an abstraction called emptyApp, which combines these five features that I singled out. - -7 -00:00:29,320 --> 00:00:52,720 -The five features are a landing page with an email sign up so you can go online right away and start collecting emails from people who are interested, a client-agnostic API server that doesn't care if the front-end is a web app or a mobile app, and then a front-end app, which for me usually is the web app, since I think the web is the biggest [INAUDIBLE] platform, and then a user model, since you need to save your users. -这五个特性是一个电子邮件注册的网页,这样你就可以立即上网,开始收集感兴趣的人的电子邮件,用一个API服务器（不在乎前端是一个移动web应用程序或应用程序与否）,然后前端应用程序,这对我来说通常是web应用程序,因为我觉得网络是最大的[全场寂静]平台,然后一个用户模型,因为您需要保存你的用户。 - -8 -00:00:52,720 --> 00:00:57,560 -And the fifth thing would be a login authentication scheme with Twitter, Facebook, G+, or email. - -9 -00:00:57,560 --> 00:01:02,550 -Let's look at the five features in emptyApp as they come from the repo when your freshly install it. - -10 -00:01:02,550 --> 00:01:12,710 -So this is emptyApp's landing page where you can collect users' email addresses who might be interested until you launch. -所以这是emptyapp着陆页，在这里您可以收集用户的电子邮件地址的人会感兴趣，直到你发射。 - -11 -00:01:12,710 --> 00:01:24,640 +1 +00:00:00,000 --> 00:00:04,950 +[MUSIC PLAYING] STEFAN RITTER: Hi guys. + +2 +00:00:04,950 --> 00:00:07,770 +I'm Stefan, and I'm working on multiple projects at the moment. +我叫斯蒂芬，此时我在工作。 + +3 +00:00:07,770 --> 00:00:12,240 +One is buzzr.io, one is fitguru.org, and one is pickfeed.io. + +4 +00:00:12,240 --> 00:00:17,830 +And today I'm going to talk about how I use a common code base to pivot to all these different ideas. + +5 +00:00:17,830 --> 00:00:23,300 +While working on different startup ideas, I quickly realized there are common parts to each idea. +当研究不同的创业想法时，我很快意识到他们有共同的部分。 +6 +00:00:23,300 --> 00:00:29,320 +So I created an abstraction called emptyApp, which combines these five features that I singled out. + +7 +00:00:29,320 --> 00:00:52,720 +The five features are a landing page with an email sign up so you can go online right away and start collecting emails from people who are interested, a client-agnostic API server that doesn't care if the front-end is a web app or a mobile app, and then a front-end app, which for me usually is the web app, since I think the web is the biggest [INAUDIBLE] platform, and then a user model, since you need to save your users. +这五个特性是一个电子邮件注册的网页,这样你就可以立即上网,开始收集感兴趣的人的电子邮件,用一个API服务器（不在乎前端是一个移动web应用程序或应用程序与否）,然后前端应用程序,这对我来说通常是web应用程序,因为我觉得网络是最大的[全场寂静]平台,然后一个用户模型,因为您需要保存你的用户。 + +8 +00:00:52,720 --> 00:00:57,560 +And the fifth thing would be a login authentication scheme with Twitter, Facebook, G+, or email. + +9 +00:00:57,560 --> 00:01:02,550 +Let's look at the five features in emptyApp as they come from the repo when your freshly install it. + +10 +00:01:02,550 --> 00:01:12,710 +So this is emptyApp's landing page where you can collect users' email addresses who might be interested until you launch. +所以这是emptyapp着陆页，在这里您可以收集用户的电子邮件地址的人会感兴趣，直到你发射。 + +11 +00:01:12,710 --> 00:01:24,640 So if you just enter an email address here, you can link it up to a Mailchimp list and collect email addresses that way. 不会翻译 A @@ -60,268 +61,268 @@ B B A A - - -12 -00:01:24,640 --> 00:01:29,530 -But then emptyApp also gives you real login functionality. -但是emptyApp也赋予了你真正的登录功能 - -13 -00:01:29,530 --> 00:01:42,980 -So for example, if we try to log on like this, this user doesn't exist. - -14 -00:01:42,980 --> 00:01:45,660 -So obviously we get an error message. - -15 -00:01:45,660 --> 00:01:56,210 -But then if we go to Join, we can create this user. -(但是如果我们加入，就能创建这个用户.） - -16 -00:01:56,210 --> 00:01:58,340 -And then now you're logged in. - -17 -00:01:58,340 --> 00:02:04,130 -So if we try to go back to the homepage, emptyApp will automatically log you back in. - -18 -00:02:04,130 --> 00:02:06,950 -And you're landing on the logged in home page. - -19 -00:02:06,950 --> 00:02:09,474 -There's also a logged out future. - -20 -00:02:09,474 --> 00:02:13,680 -So you can just log out again, and you're back logged out on the home page. - -21 -00:02:13,680 --> 00:02:18,010 -And then, of course, you can do all this as well with all the social media logins. - -22 -00:02:18,010 --> 00:02:19,426 -So here we have Twitter activated. - -23 -00:02:19,426 --> 00:02:27,857 -And then we log back in. - -24 -00:02:27,857 --> 00:02:30,440 -All right, now I'm going to show you these features in action. -没关系，我现在示范一下。 - -25 -00:02:30,440 --> 00:02:40,450 -So if we go to buzzr.io, you can see when you first land on the app there's a landing page. -所以如果我们去buzzr.io，你可以看到你第一次打开app的页面 - -26 -00:02:40,450 --> 00:02:46,400 -But then over here you see we have links to the Join, links to the Login. - -27 -00:02:46,400 --> 00:02:48,945 -And once we're here, we can log in with our user account. -一旦我们加入，我们可以用自己的用户名登录。 - -28 -00:02:48,945 --> 00:02:58,700 -我们登陆登录使用的主页。 -And we land on the logged in home page. - -29 -00:02:58,700 --> 00:03:02,930 -All right, now let me show you what the emptyApp looks like on GitHub. - -30 -00:03:02,930 --> 00:03:14,862 -So if you go to my username, stefanritter/emptyapp-- so there's a link right here so you can download and clone the app. - -31 -00:03:14,862 --> 00:03:17,070 -There are little instructions on how to do the setup. -这里有一些如何安装的说明。 - -32 -00:03:17,070 --> 00:03:25,920 -So it comes with a Grunt file, as well as scripts to do the testing and a supervisor script to watch for server changes. - -33 -00:03:25,920 --> 00:03:34,930 -So if you download the app, and then you want to start it, what you do is you CD into the emptyApp directory. - -34 -00:03:34,930 --> 00:03:37,960 -And then you just run the start script. + + +12 +00:01:24,640 --> 00:01:29,530 +But then emptyApp also gives you real login functionality. +但是emptyApp也赋予了你真正的登录功能 + +13 +00:01:29,530 --> 00:01:42,980 +So for example, if we try to log on like this, this user doesn't exist. + +14 +00:01:42,980 --> 00:01:45,660 +So obviously we get an error message. + +15 +00:01:45,660 --> 00:01:56,210 +But then if we go to Join, we can create this user. +(但是如果我们加入，就能创建这个用户.） + +16 +00:01:56,210 --> 00:01:58,340 +And then now you're logged in. + +17 +00:01:58,340 --> 00:02:04,130 +So if we try to go back to the homepage, emptyApp will automatically log you back in. + +18 +00:02:04,130 --> 00:02:06,950 +And you're landing on the logged in home page. + +19 +00:02:06,950 --> 00:02:09,474 +There's also a logged out future. + +20 +00:02:09,474 --> 00:02:13,680 +So you can just log out again, and you're back logged out on the home page. + +21 +00:02:13,680 --> 00:02:18,010 +And then, of course, you can do all this as well with all the social media logins. + +22 +00:02:18,010 --> 00:02:19,426 +So here we have Twitter activated. + +23 +00:02:19,426 --> 00:02:27,857 +And then we log back in. + +24 +00:02:27,857 --> 00:02:30,440 +All right, now I'm going to show you these features in action. +没关系，我现在示范一下。 + +25 +00:02:30,440 --> 00:02:40,450 +So if we go to buzzr.io, you can see when you first land on the app there's a landing page. +所以如果我们去buzzr.io，你可以看到你第一次打开app的页面 + +26 +00:02:40,450 --> 00:02:46,400 +But then over here you see we have links to the Join, links to the Login. + +27 +00:02:46,400 --> 00:02:48,945 +And once we're here, we can log in with our user account. +一旦我们加入，我们可以用自己的用户名登录。 + +28 +00:02:48,945 --> 00:02:58,700 +我们登陆登录使用的主页。 +And we land on the logged in home page. + +29 +00:02:58,700 --> 00:03:02,930 +All right, now let me show you what the emptyApp looks like on GitHub. + +30 +00:03:02,930 --> 00:03:14,862 +So if you go to my username, stefanritter/emptyapp-- so there's a link right here so you can download and clone the app. + +31 +00:03:14,862 --> 00:03:17,070 +There are little instructions on how to do the setup. +这里有一些如何安装的说明。 + +32 +00:03:17,070 --> 00:03:25,920 +So it comes with a Grunt file, as well as scripts to do the testing and a supervisor script to watch for server changes. + +33 +00:03:25,920 --> 00:03:34,930 +So if you download the app, and then you want to start it, what you do is you CD into the emptyApp directory. + +34 +00:03:34,930 --> 00:03:37,960 +And then you just run the start script. 然后你就可以运行你的开始脚本了。 - -35 -00:03:37,960 --> 00:03:43,870 -And what it will do is start all the tests, the Grunt watching. - -36 -00:03:43,870 --> 00:03:52,140 -And from that point on, you can demo the app on your local host. - -37 -00:03:52,140 --> 00:03:56,130 -It's a MongoDB database, so the whole app is written in JavaScript. - -38 -00:03:56,130 --> 00:03:58,460 -All my apps are written 100% in JavaScript. - -39 -00:03:58,460 --> 00:04:03,120 -Because you can use JavaScript on the front-end, on the back-end, as well as to talk to your database. - -40 -00:04:03,120 --> 00:04:05,570 -So there's less mental overhead. - -41 -00:04:05,570 --> 00:04:08,410 -For the database, I use MongoDB. -对于数据库，我使用MongoDB - -42 -00:04:08,410 --> 00:04:16,779 -MongoDB is schemaless, so you can change fields on models very quickly, which is very important when you're pivoting between extreme different ideas. - -43 -00:04:16,779 --> 00:04:20,589 -For the front-end, I use AngularJS, which has awesome dependency injection. - -44 -00:04:20,589 --> 00:04:27,310 -So it's very easy to throw around features within your app-- also, again, important when you're changing and pivoting ideas. -所以抛去特征是非常容易的，后面的不懂了。。。 - -45 -00:04:27,310 --> 00:04:33,870 -And then for the server, I use Happy.js, which is a server built specifically for being an API server. -[zhe ge mei you han yu.] - -46 -00:04:33,870 --> 00:04:38,810 -So it's very great to be a front-end-agnostic server back-end. - -47 -00:04:38,810 --> 00:04:39,860 -This is the Grunt task. + +35 +00:03:37,960 --> 00:03:43,870 +And what it will do is start all the tests, the Grunt watching. + +36 +00:03:43,870 --> 00:03:52,140 +And from that point on, you can demo the app on your local host. + +37 +00:03:52,140 --> 00:03:56,130 +It's a MongoDB database, so the whole app is written in JavaScript. + +38 +00:03:56,130 --> 00:03:58,460 +All my apps are written 100% in JavaScript. + +39 +00:03:58,460 --> 00:04:03,120 +Because you can use JavaScript on the front-end, on the back-end, as well as to talk to your database. + +40 +00:04:03,120 --> 00:04:05,570 +So there's less mental overhead. + +41 +00:04:05,570 --> 00:04:08,410 +For the database, I use MongoDB. +对于数据库，我使用MongoDB + +42 +00:04:08,410 --> 00:04:16,779 +MongoDB is schemaless, so you can change fields on models very quickly, which is very important when you're pivoting between extreme different ideas. + +43 +00:04:16,779 --> 00:04:20,589 +For the front-end, I use AngularJS, which has awesome dependency injection. + +44 +00:04:20,589 --> 00:04:27,310 +So it's very easy to throw around features within your app-- also, again, important when you're changing and pivoting ideas. +所以抛去特征是非常容易的，后面的不懂了。。。 + +45 +00:04:27,310 --> 00:04:33,870 +And then for the server, I use Happy.js, which is a server built specifically for being an API server. +[zhe ge mei you han yu.] + +46 +00:04:33,870 --> 00:04:38,810 +So it's very great to be a front-end-agnostic server back-end. + +47 +00:04:38,810 --> 00:04:39,860 +This is the Grunt task. 这是Grunt的任务。 - -48 -00:04:39,860 --> 00:04:46,610 -The Grunt task just watches for file changes and checks the code and tells you if something's wrong and runs all your tests. -我看不懂，不会翻译。 - -49 -00:04:46,610 --> 00:04:51,710 -This is the Karma tab, which runs all the front-end tasks. -这是Karma标签，它执行所有的前置任务. - -50 -00:04:51,710 --> 00:04:57,970 -And then this is the Server tab, which watches for changes in server code and restarts the server if it finds any. -然后，这是．．．．不懂了 - -51 -00:04:57,970 --> 00:05:01,870 -This is what the folder structure looks like of the code. - -52 -00:05:01,870 --> 00:05:04,364 -There are three main folders for you to watch out for. - -53 -00:05:04,364 --> 00:05:07,870 -There is the Client folder, the Server folder, and the Test folder. - -54 -00:05:07,870 --> 00:05:11,187 -It's quite self explanatory what each includes. - -55 -00:05:11,187 --> 00:05:15,270 -But it's important to point out that the client and the server are completely separate. - -56 -00:05:15,270 --> 00:05:23,085 -So this is the client-agnostic API server I talked about previously where the client could be, in this case, an AngularJS app. -所以这是客户无关的API服务器我谈到以前在客户的可能，在这种情况下，一个AngularJS应用。 - -57 -00:05:23,085 --> 00:05:29,330 -But it could also just be an iOS app or an Android app that talks to your server. -但是只有在ios或Android系统上与你的服务器相交互 - -58 -00:05:29,330 --> 00:05:43,710 -And so what happens is if you change something here, Grunt will monitor the change, and then build the front-end code again and inject it into the server. -所以如果你改动了这儿的什么，Grunt会监视变动，然后重建前端代码，把它添加到服务器里。 - -59 -00:05:43,710 --> 00:05:47,232 -So the server will serve the updated app for you. - -60 -00:05:47,232 --> 00:05:49,440 -So the other thing we talked about is the user model. - -61 -00:05:49,440 --> 00:05:56,710 -So if you look into the Server folder, you can see it comes with just one model, which is the user. -所以如果你看看服务器文件夹，你可以看到它只是一个模型，这是用户的。 - -62 -00:05:56,710 --> 00:06:03,239 -The user model comes with just the basic things you need, like username, display name, email, [INAUDIBLE], and passwords. - -63 -00:06:03,239 --> 00:06:04,780 -The controllers are also very simple. - -64 -00:06:04,780 --> 00:06:09,550 -Their authentication controller handles all the login stuff that we previously looked at. -在他们的身份验证控制器处理完所以东西之前，我们就看着。 - -65 -00:06:09,550 --> 00:06:14,400 -There's a feed controller that simply serves the logged in homepage. - -66 -00:06:14,400 --> 00:06:16,670 -There's also a little bonus here. - -67 -00:06:16,670 --> 00:06:18,970 -For real time chatting, there's a Socket.IO set up. - -68 -00:06:18,970 --> 00:06:29,580 -So under Config, there's a little Socket.IO setup where you can then send real time messages back and forth to your clients. - -69 -00:06:29,580 --> 00:06:33,559 -And so this is how I use my common code base to create all these different ideas. - -70 -00:06:33,559 --> 00:06:34,850 -You can check it out on GitHub. - -71 -00:06:34,850 --> 00:06:37,670 -It's on my user name, and then the repo is called emptyApp. - -72 -00:06:37,670 --> 00:06:39,510 -Thanks for watching. + +48 +00:04:39,860 --> 00:04:46,610 +The Grunt task just watches for file changes and checks the code and tells you if something's wrong and runs all your tests. +我看不懂，不会翻译。 + +49 +00:04:46,610 --> 00:04:51,710 +This is the Karma tab, which runs all the front-end tasks. +这是Karma标签，它执行所有的前置任务. + +50 +00:04:51,710 --> 00:04:57,970 +And then this is the Server tab, which watches for changes in server code and restarts the server if it finds any. +然后，这是．．．．不懂了 + +51 +00:04:57,970 --> 00:05:01,870 +This is what the folder structure looks like of the code. + +52 +00:05:01,870 --> 00:05:04,364 +There are three main folders for you to watch out for. + +53 +00:05:04,364 --> 00:05:07,870 +There is the Client folder, the Server folder, and the Test folder. + +54 +00:05:07,870 --> 00:05:11,187 +It's quite self explanatory what each includes. + +55 +00:05:11,187 --> 00:05:15,270 +But it's important to point out that the client and the server are completely separate. + +56 +00:05:15,270 --> 00:05:23,085 +So this is the client-agnostic API server I talked about previously where the client could be, in this case, an AngularJS app. +所以这是客户无关的API服务器我谈到以前在客户的可能，在这种情况下，一个AngularJS应用。 + +57 +00:05:23,085 --> 00:05:29,330 +But it could also just be an iOS app or an Android app that talks to your server. +但是只有在ios或Android系统上与你的服务器相交互 + +58 +00:05:29,330 --> 00:05:43,710 +And so what happens is if you change something here, Grunt will monitor the change, and then build the front-end code again and inject it into the server. +所以如果你改动了这儿的什么，Grunt会监视变动，然后重建前端代码，把它添加到服务器里。 + +59 +00:05:43,710 --> 00:05:47,232 +So the server will serve the updated app for you. + +60 +00:05:47,232 --> 00:05:49,440 +So the other thing we talked about is the user model. + +61 +00:05:49,440 --> 00:05:56,710 +So if you look into the Server folder, you can see it comes with just one model, which is the user. +所以如果你看看服务器文件夹，你可以看到它只是一个模型，这是用户的。 + +62 +00:05:56,710 --> 00:06:03,239 +The user model comes with just the basic things you need, like username, display name, email, [INAUDIBLE], and passwords. + +63 +00:06:03,239 --> 00:06:04,780 +The controllers are also very simple. + +64 +00:06:04,780 --> 00:06:09,550 +Their authentication controller handles all the login stuff that we previously looked at. +在他们的身份验证控制器处理完所以东西之前，我们就看着。 + +65 +00:06:09,550 --> 00:06:14,400 +There's a feed controller that simply serves the logged in homepage. + +66 +00:06:14,400 --> 00:06:16,670 +There's also a little bonus here. + +67 +00:06:16,670 --> 00:06:18,970 +For real time chatting, there's a Socket.IO set up. + +68 +00:06:18,970 --> 00:06:29,580 +So under Config, there's a little Socket.IO setup where you can then send real time messages back and forth to your clients. + +69 +00:06:29,580 --> 00:06:33,559 +And so this is how I use my common code base to create all these different ideas. + +70 +00:06:33,559 --> 00:06:34,850 +You can check it out on GitHub. + +71 +00:06:34,850 --> 00:06:37,670 +It's on my user name, and then the repo is called emptyApp. + +72 +00:06:37,670 --> 00:06:39,510 +Thanks for watching.