Revert "added sorting algorithm"

This reverts commit 4c711c0.

Author: GohVh

exe2.ipynb

@@ -1023,156 +1023,6 @@
     "    i+1"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# 2.36, skip 2.37\n",
-    "import random\n",
-    "#move adjacent cell\n",
-    "# only fall in the same cell will decide being eaten or move back to original place and reproduce\n",
-    "\n",
-    "class Animal:\n",
-    "    def __init__(self, name, ori_location_id, ecolist):\n",
-    "        self._name = name\n",
-    "        self._ecolist = ecolist\n",
-    "        self._ori_location_id = ori_location_id\n",
-    "\n",
-    "    def getname(self):\n",
-    "        return self._name\n",
-    "    \n",
-    "    def move(self, new_location):\n",
-    "        if not new_location is None:\n",
-    "            return False\n",
-    "        else: return True\n",
-    "    \n",
-    "    def is_same_species(self):\n",
-    "        if self._move():\n",
-    "\n",
-    "class Bear(Animal):\n",
-    "    def __init__(self, name, ori_location_id, ecolist):\n",
-    "        super().__init__(name, ori_location_id, ecolist)\n",
-    "    \n",
-    "    def eat(self, animaltype):\n",
-    "        pass\n",
-    "\n",
-    "class Fish(Animal):\n",
-    "    def __init__(self, name, ori_location_id, ecolist):\n",
-    "        super().__init__(name, ori_location_id, ecolist)\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "class RiverEco:\n",
-    "\n",
-    "    MOVE_CHANCE = 0.2\n",
-    "    LEFT_RIGHT = 0.5\n",
-    "\n",
-    "    def __init__(self, totalnum, bearnum=2, fishnum=10):\n",
-    "        \n",
-    "        self._totalnum=totalnum\n",
-    "        self._bearnum=bearnum\n",
-    "        self._fishnum=fishnum\n",
-    "        self._ecolist = [None for i in range(totalnum)]\n",
-    "\n",
-    "    def _init_assign_animal(self):\n",
-    "        randlist = random.sample(range(0,self._totalnum-1),self._bearnum+self._fishnum)\n",
-    "        bearlist = random.sample(randlist, self._bearnum)\n",
-    "        fishlist = randlist.copy()\n",
-    "        for i in randlist:\n",
-    "            if i in bearlist:\n",
-    "                fishlist.remove(i)\n",
-    "        \n",
-    "        for i in bearlist:\n",
-    "            self._ecolist[i]=Bear('B',i, self._ecolist)\n",
-    "        for i in fishlist:\n",
-    "            self._ecolist[i]=Fish('F',i, self._ecolist)\n",
-    "    \n",
-    "    def check_species(self, location1, location2):\n",
-    "        animal1, animal2 = self._ecolist[location1], self._ecolist[location2]\n",
-    "        if animal1.getname() == animal2.getname(): return True # return True = create new\n",
-    "        else: return False # return False = eat prey (eat Fish)\n",
-    "    \n",
-    "    def startgame(self):\n",
-    "        self._init_assign_animal()\n",
-    "        if random.random()>self.MOVE_CHANCE:\n",
-    "            for i in range(len(self._ecolist)):\n",
-    "                if self._ecolist[i] != None:\n",
-    "                    if random.random()>self.LEFT_RIGHT and i+1<len(self._ecolist):\n",
-    "                        if self._ecolist[i+1] != None:\n",
-    "                            if self.check_species(i, i+1):\n",
-    "                                self.createnew()\n",
-    "                            else: self.remove(i,i+1)\n",
-    "                        else:\n",
-    "                            self._ecolist[i+1]=self._ecolist[i]\n",
-    "                            self._ecolist[i] = None\n",
-    "                    elif random.random()<=self.LEFT_RIGHT and i-1>=0:\n",
-    "                        if self._ecolist[i-1] != None:\n",
-    "                            if self.check_species(i, i-1):\n",
-    "                                self.createnew()\n",
-    "                            else: self.remove(i,i-1)\n",
-    "                        else:\n",
-    "                            self._ecolist[i-1]=self._ecolist[i]\n",
-    "                            self._ecolist[i] = None\n",
-    "        self.checkeco()\n",
-    "    \n",
-    "    def checkeco(self):\n",
-    "        for i in range(1,len(self._ecolist)-1):\n",
-    "            if self._ecolist[i] != None:\n",
-    "                if self._ecolist[i-1] != None:\n",
-    "                    if not self.check_species(i, i-1):\n",
-    "                        self.remove(i,i-1)\n",
-    "                elif self._ecolist[i+1] != None:\n",
-    "                    if not self.check_species(i, i+1):\n",
-    "                        self.remove(i,i+1)\n",
-    "    \n",
-    "    def createnew(self):\n",
-    "        r = random.randint(0,len(self._ecolist)-1)\n",
-    "        while self._ecolist[r]==None:\n",
-    "            r = random.randint(0,len(self._ecolist)-1)\n",
-    "        name = self._ecolist[r].getname()\n",
-    "        if name == 'B':\n",
-    "            self._ecolist[i]=Bear('B', r, self._ecolist)\n",
-    "        elif name == 'F':\n",
-    "            self._ecolist[i]=Bear('F', r, self._ecolist)\n",
-    "    \n",
-    "    def remove(self, location1, location2):\n",
-    "        animal1, animal2 = self._ecolist[location1], self._ecolist[location2]\n",
-    "        if animal1.getname() == 'B':\n",
-    "            self._ecolist[location2] = None\n",
-    "        elif animal2.getname() == 'B': \n",
-    "            self._ecolist[location1] = None\n",
-    "    \n",
-    "    def printgame(self):\n",
-    "        eco=''\n",
-    "        for i in self._ecolist:\n",
-    "            if i != None:\n",
-    "                eco+=i.getname()\n",
-    "            else: eco+='-'\n",
-    "        print(eco)\n",
-    "        "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "game1 = RiverEco(totalnum=100)\n",
-    "i = 0\n",
-    "for i in range(40):\n",
-    "    game1.startgame()\n",
-    "    game1.printgame()\n",
-    "    i+1"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -1310,7 +1160,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.7.13 ('deepcv')",
+   "display_name": "Python 3.9.12 ('deepcv')",
    "language": "python",
    "name": "python3"
   },
@@ -1324,12 +1174,12 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.13"
+   "version": "3.9.12"
   },
   "orig_nbformat": 4,
   "vscode": {
    "interpreter": {
-    "hash": "bc8728ca46fe0e46829d869d02c49a317711a0a5ed1f065b44257a00e89bb2e2"
+    "hash": "38e3adfb29cde9206c861f814c9fa42a1353f77e60ebe68d31b54d2673048b17"
    }
   }
  },