Commit 2c0bc94

authored

Merge branch 'youngyangyang04:master' into master

2 parents 64d477e + aacbbfb commit 2c0bc94Copy full SHA for 2c0bc94

File tree

+90

-4

lines changed

+90

-4

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,8 @@`
`531`	`531`
`532`	`532`	`如果是已工作,备注:姓名-城市-岗位-组队刷题。如果学生,备注:姓名-学校-年级-组队刷题。备注没有自我介绍不通过哦`
`533`	`533`
`534`		`-<div align="center"><img src="https://code-thinking-1253855093.file.myqcloud.com/pics/20220426233122.png" data-img="1" width="200" height="200"></img></div>`
	`534`	`+`
	`535`	`+<div align="center"><img src="https://code-thinking-1253855093.file.myqcloud.com/pics/第二企业刷题活码.png" data-img="1" width="200" height="200"></img></div>`
`535`	`536`
`536`	`537`
`537`	`538`
`@@ -543,6 +544,7 @@`
`543`	`544`
`544`	`545`	`来看看就知道了,你会发现相见恨晚!`
`545`	`546`
	`547`	`+`
`546`	`548`	`<a name="公众号"></a>`
`547`	`549`	`<div align="center"><img src="https://code-thinking-1253855093.file.myqcloud.com/pics/20211026122841.png" data-img="1" width="650" height="500"></img></div>`
`548`	`550`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,10 +281,8 @@ func removeElement(_ nums: inout [Int], _ val: Int) -> Int {`
`281`	`281`
`282`	`282`	`for fastIndex in 0..<nums.count {`
`283`	`283`	`if val != nums[fastIndex] {`
`284`		`- if slowIndex != fastIndex {`
`285`	`284`	`nums[slowIndex] = nums[fastIndex]`
`286`		`- }`
`287`		`- slowIndex += 1`
	`285`	`+ slowIndex += 1`
`288`	`286`	`}`
`289`	`287`	`}`
`290`	`288`	`return slowIndex`

Lines changed: 52 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,36 @@ class Solution:`
`311`	`311`	```
`312`	`312`
`313`	`313`	`Go:`
	`314`	`+> 贪心法:`
	`315`	+```Go
	`316`	`+func maxProfit(prices []int) int {`
	`317`	`+ low := math.MaxInt32`
	`318`	`+ rlt := 0`
	`319`	`+ for i := range prices{`
	`320`	`+ low = min(low, prices[i])`
	`321`	`+ rlt = max(rlt, prices[i]-low)`
	`322`	`+ }`
	`323`	`+`
	`324`	`+ return rlt`
	`325`	`+}`
	`326`	`+func min(a, b int) int {`
	`327`	`+ if a < b{`
	`328`	`+ return a`
	`329`	`+ }`
	`330`	`+`
	`331`	`+ return b`
	`332`	`+}`
	`333`	`+`
	`334`	`+func max(a, b int) int {`
	`335`	`+ if a > b{`
	`336`	`+ return a`
	`337`	`+ }`
	`338`	`+`
	`339`	`+ return b`
	`340`	`+}`
	`341`	+```
`314`	`342`
	`343`	`+> 动态规划:版本一`
`315`	`344`	```Go
`316`	`345`	`func maxProfit(prices []int) int {`
`317`	`346`	`length:=len(prices)`
`@@ -338,6 +367,29 @@ func max(a,b int)int {`
`338`	`367`	`}`
`339`	`368`	```
`340`	`369`
	`370`	`+> 动态规划:版本二`
	`371`	+```Go
	`372`	`+func maxProfit(prices []int) int {`
	`373`	`+ dp := [2][2]int{}`
	`374`	`+ dp[0][0] = -prices[0]`
	`375`	`+ dp[0][1] = 0`
	`376`	`+ for i := 1; i < len(prices); i++{`
	`377`	`+ dp[i%2][0] = max(dp[(i-1)%2][0], -prices[i])`
	`378`	`+ dp[i%2][1] = max(dp[(i-1)%2][1], dp[(i-1)%2][0]+prices[i])`
	`379`	`+ }`
	`380`	`+`
	`381`	`+ return dp[(len(prices)-1)%2][1]`
	`382`	`+}`
	`383`	`+`
	`384`	`+func max(a, b int) int {`
	`385`	`+ if a > b{`
	`386`	`+ return a`
	`387`	`+ }`
	`388`	`+`
	`389`	`+ return b`
	`390`	`+}`
	`391`	+```
	`392`	`+`
`341`	`393`	`JavaScript:`
`342`	`394`
`343`	`395`	`> 动态规划`

Lines changed: 34 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -252,5 +252,39 @@ var lemonadeChange = function(bills) {`
`252`	`252`
`253`	`253`	```
`254`	`254`
	`255`	`+### TypeScript`
	`256`	`+`
	`257`	+```typescript
	`258`	`+function lemonadeChange(bills: number[]): boolean {`
	`259`	`+ let five: number = 0,`
	`260`	`+ ten: number = 0;`
	`261`	`+ for (let bill of bills) {`
	`262`	`+ switch (bill) {`
	`263`	`+ case 5:`
	`264`	`+ five++;`
	`265`	`+ break;`
	`266`	`+ case 10:`
	`267`	`+ if (five < 1) return false;`
	`268`	`+ five--;`
	`269`	`+ ten++`
	`270`	`+ break;`
	`271`	`+ case 20:`
	`272`	`+ if (ten > 0 && five > 0) {`
	`273`	`+ five--;`
	`274`	`+ ten--;`
	`275`	`+ } else if (five > 2) {`
	`276`	`+ five -= 3;`
	`277`	`+ } else {`
	`278`	`+ return false;`
	`279`	`+ }`
	`280`	`+ break;`
	`281`	`+ }`
	`282`	`+ }`
	`283`	`+ return true;`
	`284`	`+};`
	`285`	+```
	`286`	`+`
	`287`	`+`
	`288`	`+`
`255`	`289`	`-----------------------`
`256`	`290`	`<div align="center"><img src=https://code-thinking.cdn.bcebos.com/pics/01二维码一.jpg width=500> </img></div>`

Comments

(0)