adding consistency to the repo

SigOiry · Jul 4, 2024 · 6fefdb2 · 6fefdb2
1 parent 2edba26
commit 6fefdb2
Show file tree

Hide file tree

Showing 14 changed files with 180 additions and 158 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,17 @@
 .Rhistory
 .RData
 .Ruserdata
-Data/np_arrays/**
 Output/Pred/**
 *.pyc
 /.quarto/
+
+Data/img/*
+!Data/img/Gafanha_Low_LowRes.tif
+
+Data/shp/*
+!Data/shp/mask/Gafanha_Low.shp
+!Data/shp/mask/Gafanha_Low.cpg
+!Data/shp/mask/Gafanha_Low.dbf
+!Data/shp/mask/Gafanha_Low.prj
+!Data/shp/mask/Gafanha_Low.qmd
+!Data/shp/mask/Gafanha_Low.shx
diff --git a/Data/Training/DISCOV_Invasea_V3.csv b/Data/Training/DISCOV_Invasea_V3.csv
diff --git a/Data/shp/Gafanha_Low.cpg b/Data/shp/Gafanha_Low.cpg
diff --git a/Data/shp/Gafanha_Low.dbf b/Data/shp/Gafanha_Low.dbf
diff --git a/Data/shp/Gafanha_Low.prj b/Data/shp/Gafanha_Low.prj
diff --git a/Data/shp/Gafanha_Low.qmd b/Data/shp/Gafanha_Low.qmd
diff --git a/Data/shp/Gafanha_Low.shp b/Data/shp/Gafanha_Low.shp
diff --git a/Data/shp/Gafanha_Low.shx b/Data/shp/Gafanha_Low.shx
diff --git a/Models/DISCOV_BiCOME_reframed.pkl → Models/DISCOV_BiCOME.pkl b/Models/DISCOV_BiCOME_reframed.pkl → Models/DISCOV_BiCOME.pkl
diff --git a/Models/DISCOV_InvaSea.pkl b/Models/DISCOV_InvaSea.pkl
diff --git a/Models/DISCOV_Invasea_V2.pkl b/Models/DISCOV_Invasea_V2.pkl
diff --git a/Scripts/Batch_prediction.ipynb b/Scripts/Batch_prediction.ipynb
@@ -32,7 +32,7 @@
     "          \"Lorois_50m_MicasenseV3\",\n",
     "          \"NorthDike_high_multi\"] \n",
     "\n",
-    "models = [\"DISCOV_BiCOME_reframed\", \"DiSCOV_InvaSea_V3\"]\n",
+    "models = [\"DISCOV_BiCOME_reframed\", \"DiSCOV_InvaSea\"]\n",
     "\n",
     "\n",
     "batch_prediction(images, models)"

diff --git a/Scripts/Model_Training.ipynb b/Scripts/Model_Training.ipynb
@@ -2,23 +2,11 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {
     "tags": []
    },
-   "outputs": [
-    {
-     "ename": "ModuleNotFoundError",
-     "evalue": "No module named 'fastbook'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[1;31mModuleNotFoundError\u001b[0m                       Traceback (most recent call last)",
-      "Cell \u001b[1;32mIn[2], line 2\u001b[0m\n\u001b[0;32m      1\u001b[0m \u001b[38;5;66;03m#hide\u001b[39;00m\n\u001b[1;32m----> 2\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mfastbook\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;241m*\u001b[39m\n\u001b[0;32m      3\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mfastinference\u001b[39;00m\n\u001b[0;32m      4\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mpandas\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mapi\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mtypes\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m is_string_dtype, is_numeric_dtype, is_categorical_dtype\n",
-      "\u001b[1;31mModuleNotFoundError\u001b[0m: No module named 'fastbook'"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "#hide\n",
     "from fastbook import *\n",
@@ -73,20 +61,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 3,
    "metadata": {
     "tags": []
    },
    "outputs": [],
    "source": [
     "df_nn = pd.read_csv('../Data/Training/DISCOV_Invasea_V3.csv', low_memory=False,sep=\";\")\n",
     "\n",
-    "output_name = '../models/DISCOV_InvaSea_V3.pkl'"
+    "output_name = '../models/DISCOV_InvaSea.pkl'"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -95,7 +83,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -298,7 +286,7 @@
        "[1141506 rows x 23 columns]"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }