I made a commit on wrong branch, which is rwd-layout,

the right way is, I should create a new branch called "algo-OddEvenSort",
which is based on main branch,

then switch to OddEvenSort branch, code the new feature,
but I forgot, I commit and push to remote on rwd-layout branch,
so now I need to do something to make it back to right way.

now, I create and switch to the algo-OddEvenSort branch,
I try to do cherry-pick command to merge latest node of rwd-layout to
algo-OddEvenSort branch,

then I would try revert rwd-layout branch for restore the impact to
remote origin on GitHub.

OK, let's do this.

Changes to be committed:
modified:   index.html
		1. add new algorithm , odd-even sorting algorithm
		2. add odd-even-sort.js file in bottom of index.html

	new file:   js/odd_even_sort.js
		1. add new odd-even sorting algorithm content

	modified:   js/test.js
		1. add try catch syntax in algoChosen() function
		2. add OddEvenSort value
		3. add , if algoChosen() error, then window alert pops
		   up, notices user to press F5 to refresh page.

Author: adyjs

index.html

@@ -26,7 +26,7 @@
 							<option class="options" value="ExchangeSort">Exchange Sort</option>
 							<option class="options" value="InsertionSort">Insertion Sort</option>
 							<option class="options" value="ShakerSort">Shaker Sort</option>
-							<!-- <option class="options" value="MergeSort">Merge Sort</option> -->
+							<option class="options" value="OddEvenSort">Odd-Even Sort</option>
 						</select>
 					</div>
 				</div>
@@ -75,15 +75,18 @@
 
 	</main>
 
-	
+	 
 
 	<script type="text/javascript" src="./js/main.js"></script>
 	<script type="text/javascript" src="./js/bubble_sort.js"></script>
 	<script type="text/javascript" src="./js/selection_sort.js"></script>
 	<script type="text/javascript" src="./js/exchange_sort.js"></script>
 	<script type="text/javascript" src="./js/insertion_sort.js"></script>
 	<script type="text/javascript" src="./js/shaker_sort.js"></script>
+<<<<<<< HEAD
 	<!-- <script type="text/javascript" src="./js/merge_sort.js"></script> -->
+=======
+	<script type="text/javascript" src="./js/odd_even_sort.js"></script>
 	<script type="text/javascript" src="./js/test.js"></script>
 </body>
 </html>

js/odd_even_sort.js

@@ -0,0 +1,85 @@
+'strict'
+
+class OddEvenSort extends SortingBase{
+    constructor(){
+        super();
+    }
+     
+    splitTime = 1000;
+
+    setSplitTime(mspf){
+        if(mspf <3){
+            this.splitTime = 1;
+            return;
+        }
+        this.splitTime = mspf /3;
+    }
+
+    static async run(one, sleep, endingPose){
+        let temp;
+        let isAllSorted;
+        one.setSplitTime(one.milliSecPerFrame)
+
+        isAllSorted = 0;
+
+        while(1){
+            for(let i=0 ; i<one.entryNum ; i=i+2){
+
+                if( (i+1) < one.entryNum){
+
+                    one.compareColoring(one.blockBox[i] , one.blockBox[i+1]);
+                    one.fillStageWithBlocks();
+                    await sleep(one.splitTime);
+
+                    if(one.blockBox[i].value > one.blockBox[i+1].value){
+                        temp = one.blockBox[i];
+                        one.blockBox[i] = one.blockBox[i+1];
+                        one.blockBox[i+1] = temp;
+                        isAllSorted++;
+                    }
+
+                    one.checkCompareColoring(one.blockBox[i] , one.blockBox[i+1]);
+                    one.fillStageWithBlocks();
+                    await sleep(one.splitTime);
+
+                    one.doneCompareColoring(one.blockBox[i] , one.blockBox[i+1]);
+                    one.fillStageWithBlocks();
+                    await sleep(one.splitTime);
+
+                }
+            }; 
+            if(!isAllSorted){break;}
+            isAllSorted = 0;
+            for(let i=1 ; i<one.entryNum ; i=i+2){
+                if( (i+1) < one.entryNum){
+
+                    one.compareColoring(one.blockBox[i] , one.blockBox[i+1]);
+                    one.fillStageWithBlocks();
+                    await sleep(one.splitTime);
+
+                    if(one.blockBox[i].value > one.blockBox[i+1].value){
+                        temp = one.blockBox[i];
+                        one.blockBox[i] = one.blockBox[i+1];
+                        one.blockBox[i+1] = temp;
+                        isAllSorted++;
+                    }
+
+                    one.checkCompareColoring(one.blockBox[i] , one.blockBox[i+1]);
+                    one.fillStageWithBlocks();
+                    await sleep(one.splitTime);
+
+                    one.doneCompareColoring(one.blockBox[i] , one.blockBox[i+1]);
+                    one.fillStageWithBlocks();
+                    await sleep(one.splitTime);
+                }
+            };
+            if(!isAllSorted){break;}
+            isAllSorted = 0;
+        }
+
+        endingPose(one, sleep)
+        
+        console.log('done')
+    }
+
+}

js/test.js

@@ -30,40 +30,49 @@ window.onload = function(){
 
 function algoChosen(){
 
-    algo = algoSelector.value;
-    if(algo === null || algo === 'none'){
-        clearInputDashBoard();
-        allDisable([algoSelector]);   
-    }
-    else{
-        if(algo === 'BubbleSort'){
-            one = new BubbleSort();
-            classOne = BubbleSort;
-        }
-        else if(algo === 'SelectionSort'){
-            one = new SelectionSort();
-            classOne = SelectionSort;
-        }
-        else if(algo === 'ExchangeSort'){
-            one = new ExchangeSort();
-            classOne = ExchangeSort;
-        }
-        else if(algo === 'InsertionSort'){
-            one = new InsertionSort();
-            classOne = InsertionSort;
+    try{
+
+        algo = algoSelector.value;
+        if(algo === null || algo === 'none'){
+            clearInputDashBoard();
+            allDisable([algoSelector]);   
         }
-        else if(algo === 'ShakerSort'){
-            one = new ShakerSort();
-            classOne = ShakerSort;
+        else{
+            if(algo === 'BubbleSort'){
+                one = new BubbleSort();
+                classOne = BubbleSort;
+            }
+            else if(algo === 'SelectionSort'){
+                one = new SelectionSort();
+                classOne = SelectionSort;
+            }
+            else if(algo === 'ExchangeSort'){
+                one = new ExchangeSort();
+                classOne = ExchangeSort;
+            }
+            else if(algo === 'InsertionSort'){
+                one = new InsertionSort();
+                classOne = InsertionSort;
+            }
+            else if(algo === 'ShakerSort'){
+                one = new ShakerSort();
+                classOne = ShakerSort;
+            }
+            else if(algo === 'OddEvenSort'){
+                one = new OddEvenSort();
+                classOne = OddEvenSort;
+            } 
+            else{
+                window.alert('演算法系統錯誤，\n請按 F5 重新整理系統，再次使用。');
+                // refresh();
+            }
+    
+            allEnable([goBtn])
         }
-        // else if(algo === 'MergeSort'){
-        //     one = new MergeSort();
-        //     classOne = MergeSort;
-        // }
 
-        allEnable([goBtn])
     }
-    
+    catch(e){
+    }
 }
 
 function clearInputDashBoard(){
@@ -125,7 +134,7 @@ function inputInvalid(entryNum , mspfNum){
     }
     return false;
 }
-
+ 
 function prepareForRun(){
     one.entryNum = isCountInputValid( parseInt(countInput.value, 10) );
     one.milliSecPerFrame = isMspfInputValid( parseInt(mspfInput.value, 10));