Commitcc875bd

committed

update 148

1 parent91544dc commitcc875bdCopy full SHA for cc875bd

File tree

+43

-5

lines changed

src
- main/java/com/fishercoder/solutions
  - _148.java
- test/java/com/fishercoder
  - _148Test.java

+43

-5

lines changed

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@`
`2`	`2`
`3`	`3`	`importcom.fishercoder.common.classes.ListNode;`
`4`	`4`
	`5`	`+importjava.util.ArrayList;`
	`6`	`+importjava.util.Collections;`
	`7`	`+importjava.util.List;`
	`8`	`+`
`5`	`9`	`publicclass_148 {`
`6`	`10`
`7`	`11`	`publicstaticclassSolution1 {`
`@@ -192,4 +196,29 @@ private ListNode getMid(ListNode head) {`
`192`	`196`	`returnmid;`
`193`	`197`	`}`
`194`	`198`	`}`
	`199`	`+`
	`200`	`+publicstaticclassSolution4 {`
	`201`	`+/*This is the most naive, using O(n) extra memory, O(nlogn) time./`
	`202`	`+publicListNodesortList(ListNodehead) {`
	`203`	`+if (head ==null) {`
	`204`	`+returnhead;`
	`205`	`+ }`
	`206`	`+List<Integer>list =newArrayList<>();`
	`207`	`+ListNodetmp =head;`
	`208`	`+while (tmp !=null) {`
	`209`	`+list.add(tmp.val);`
	`210`	`+tmp =tmp.next;`
	`211`	`+ }`
	`212`	`+Collections.sort(list);`
	`213`	`+ListNodepre =newListNode(-1);`
	`214`	`+ListNodenewHead =newListNode(list.get(0));`
	`215`	`+pre.next =newHead;`
	`216`	`+for (inti =1;i <list.size();i++) {`
	`217`	`+ListNodenext =newListNode(list.get(i));`
	`218`	`+newHead.next =next;`
	`219`	`+newHead =newHead.next;`
	`220`	`+ }`
	`221`	`+returnpre.next;`
	`222`	`+ }`
	`223`	`+ }`
`195`	`224`	`}`

Lines changed: 14 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,23 +3,25 @@`
`3`	`3`	`importcom.fishercoder.common.classes.ListNode;`
`4`	`4`	`importcom.fishercoder.common.utils.LinkedListUtils;`
`5`	`5`	`importcom.fishercoder.solutions._148;`
`6`		`-importorg.junit.BeforeClass;`
`7`		`-importorg.junit.Test;`
	`6`	`+importorg.junit.jupiter.api.BeforeEach;`
	`7`	`+importorg.junit.jupiter.api.Test;`
`8`	`8`
`9`		`-importstaticorg.junit.Assert.assertEquals;`
	`9`	`+importstaticorg.junit.jupiter.api.Assertions.assertEquals;`
`10`	`10`
`11`	`11`	`publicclass_148Test {`
`12`	`12`	`privatestatic_148.Solution1solution1;`
`13`	`13`	`privatestatic_148.Solution2solution2;`
`14`	`14`	`privatestatic_148.Solution3solution3;`
	`15`	`+privatestatic_148.Solution4solution4;`
`15`	`16`	`privatestaticListNodehead;`
`16`	`17`	`privatestaticListNodeexpected;`
`17`	`18`
`18`		`-@BeforeClass`
`19`		`-publicstaticvoidsetup() {`
	`19`	`+@BeforeEach`
	`20`	`+publicvoidsetup() {`
`20`	`21`	`solution1 =new_148.Solution1();`
`21`	`22`	`solution2 =new_148.Solution2();`
`22`	`23`	`solution3 =new_148.Solution3();`
	`24`	`+solution4 =new_148.Solution4();`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`@Test`
`@@ -43,4 +45,11 @@ public void test3() {`
`43`	`45`	`assertEquals(expected,solution3.sortList(head));`
`44`	`46`	`}`
`45`	`47`
	`48`	`+@Test`
	`49`	`+publicvoidtest4() {`
	`50`	`+head =LinkedListUtils.contructLinkedList(newint[]{4,2,1,3});`
	`51`	`+expected =LinkedListUtils.contructLinkedList(newint[]{1,2,3,4});`
	`52`	`+assertEquals(expected,solution4.sortList(head));`
	`53`	`+ }`
	`54`	`+`
`46`	`55`	`}`

Comments

(0)