Commit fe7a2ae

committed

Merge branch 'master' of https://github.com/chiuchiuuu/programming-and-algorithm

2 parents f7f58e2 + 3550da5 commit fe7a2aeCopy full SHA for fe7a2ae

File tree

4 files changed

+29

-28

lines changed

1.计算导论与C语言基础
- week1
  - Week1.md
- week2
  - Week2.md
- week3
  - Week3.md
README.md

4 files changed

+29

-28

lines changed

`‎1.计算导论与C语言基础/week1/Week1.md`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ C程序设计`
`64`	`64`
`65`	`65`	`图灵机实现加法`
`66`	`66`
`67`		`-![img](/img/1.png)`
	`67`	`+![img](../img/1.png)`
`68`	`68`
`69`		`-![img](/img/2.png)`
	`69`	`+![img](../img/2.png)`
`70`	`70`
`71`		`-![img](/img/3.png)`
	`71`	`+![img](../img/3.png)`
`72`	`72`
`73`	`73`	`停机表示计算完毕,表示当前存储带上保留的就是计算结果!`
`74`	`74`
`@@ -88,7 +88,7 @@ C程序设计`
`88`	`88`
`89`	`89`	`## 数的二进制表示`
`90`	`90`
`91`		`-![img](/img/4.png)`
	`91`	`+![img](../img/4.png)`
`92`	`92`
`93`	`93`	`## 二进制的布尔运算`
`94`	`94`
`@@ -97,7 +97,7 @@ C程序设计`
`97`	`97`	`- 基本逻辑运算:与、或、非`
`98`	`98`	`- 复合逻辑运算:同或、异或、与非、或非、与或非`
`99`	`99`
`100`		`-![img](/img/5.png)`
	`100`	`+![img](../img/5.png)`
`101`	`101`
`102`	`102`	`加法运算`
`103`	`103`
`@@ -106,10 +106,10 @@ C程序设计`
`106`	`106`
`107`	`107`	`半加器`
`108`	`108`
`109`		`-![img](/img/6.png)`
	`109`	`+![img](../img/6.png)`
`110`	`110`
`111`	`111`	`全加器`
`112`	`112`
`113`		`-![img](/img/7.png)`
	`113`	`+![img](../img/7.png)`
`114`	`114`
`115`		`-以上简单的布尔运算都可通过电路实现!`
	`115`	`+以上简单的布尔运算都可通过电路实现!`

`‎1.计算导论与C语言基础/week2/Week2.md`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,37 +2,37 @@`
`2`	`2`
`3`	`3`	`### 历史上的计算设备`
`4`	`4`
`5`		`-![img](/img/8.png)`
	`5`	`+![img](../img/8.png)`
`6`	`6`
`7`	`7`	`差分机`
`8`	`8`
`9`		`-![img](/img/10.png)`
	`9`	`+![img](../img/10.png)`
`10`	`10`
`11`	`11`	`制表机`
`12`	`12`
`13`		`-![img](/img/11.png)`
	`13`	`+![img](../img/11.png)`
`14`	`14`
`15`	`15`	`第一台电子计算机:ENIAC`
`16`	`16`
`17`	`17`	`EDVAC是世界上第一台存储程序计算机,是所有现代计算机的原型和范本`
`18`	`18`
`19`	`19`	`### 从电子管到云计算`
`20`	`20`
`21`		`-![img](/img/12.png)`
	`21`	`+![img](../img/12.png)`
`22`	`22`
`23`		`-![img](/img/13.png)`
	`23`	`+![img](../img/13.png)`
`24`	`24`
`25`		`-![img](/img/14.png)`
	`25`	`+![img](../img/14.png)`
`26`	`26`
`27`		`-![img](/img/15.png)`
	`27`	`+![img](../img/15.png)`
`28`	`28`
`29`		`-![img](/img/16.png)`
	`29`	`+![img](../img/16.png)`
`30`	`30`
`31`		`-![img](/img/17.png)`
	`31`	`+![img](../img/17.png)`
`32`	`32`
`33`		`-![img](/img/18.png)`
	`33`	`+![img](../img/18.png)`
`34`	`34`
`35`		`-![img](/img/19.png)`
	`35`	`+![img](../img/19.png)`
`36`	`36`
`37`	`37`	`新型计算模式——云计算`
`38`	`38`
`@@ -48,7 +48,7 @@ EDVAC是世界上第一台存储程序计算机,是所有现代计算机的原`
`48`	`48`
`49`	`49`	`#### 量子计算机的基本原理`
`50`	`50`
`51`		`-![img](/img/20.png)`
	`51`	`+![img](../img/20.png)`
`52`	`52`
`53`	`53`	`经典计算:`
`54`	`54`
`@@ -62,5 +62,5 @@ EDVAC是世界上第一台存储程序计算机,是所有现代计算机的原`
`62`	`62`	`- n比特同时存储2ドル^n$个数`
`63`	`63`	`- 同时接受2ドル^n$个输入数据,同时完成2ドル^n$次运算,输出2ドル^n$个结果`
`64`	`64`
`65`		`-![img](/img/21.png)`
	`65`	`+![img](../img/21.png)`
`66`	`66`

`‎1.计算导论与C语言基础/week3/Week3.md`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,22 +10,22 @@`
`10`	`10`	`- 用布尔代数进行运算`
`11`	`11`	`- 用电路实现布尔运算`
`12`	`12`
`13`		`-![](/img/22.png)`
	`13`	`+![](../img/22.png)`
`14`	`14`
`15`	`15`	`### 冯诺依曼式计算机`
`16`	`16`
`17`	`17`	`存储程序式计算机`
`18`	`18`
`19`		`-![img](/img/23.png)`
	`19`	`+![img](../img/23.png)`
`20`	`20`
`21`	`21`	`工作过程`
`22`	`22`
`23`		`-![img](/img/24.png)`
	`23`	`+![img](../img/24.png)`
`24`	`24`
`25`	`25`	`与现代计算机的对应关系`
`26`	`26`
`27`		`-![img](/img/25.png)`
	`27`	`+![img](../img/25.png)`
`28`	`28`
`29`	`29`	`### 存储器的种类与特点`
`30`	`30`
`31`		`-见PPT`
	`31`	`+见PPT`

`‎README.md`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# README`
`2`	`2`
`3`		`-2018年1月13日`
`4`		`-这两周期末考试先暂停学习。`
	`3`	`+2018年1月13日:这两周期末考试先暂停学习。`
	`4`	`+`
	`5`	`+2018年3月10日:由于觉得数据结构与算法的课程不是很好以及令人崩溃的作业平台。决定学习coursera上的另一门课程,普林斯顿大学开设的Algorithms,同时阅读配套教材。然而不想半途而废这个项目,等学完算法后再回来只看PPT做习题不听课。`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit fe7a2ae

File tree

4 files changed

4 files changed

`‎1.计算导论与C语言基础/week1/Week1.md`

`‎1.计算导论与C语言基础/week2/Week2.md`

`‎1.计算导论与C语言基础/week3/Week3.md`

`‎README.md`

0 commit comments