Commit 3ee02b10 authored by Nathaniel Callens's avatar Nathaniel Callens

Merge branch 'master' of git.elphel.com:Elphel/master

parents b3003237 e7d79230
No preview for this file type
......@@ -307,7 +307,11 @@
"source": [
"def encoder(error, list_dic, diff, bound, bins):\n",
" \"\"\"\n",
<<<<<<< HEAD
" This function en\n",
=======
" This function \n",
>>>>>>> a352868acf14cebeaa7ea2a58e879b1d36b066ad
" \"\"\"\n",
" # copy the error matrix (including the boundary)\n",
" encoded = np.copy(error).astype(int).astype(str).astype(object)\n",
......@@ -512,7 +516,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.11"
"version": "3.9.1"
}
},
"nbformat": 4,
......
......@@ -307,7 +307,7 @@
"source": [
"def encoder(error, list_dic, diff, bound, bins):\n",
" \"\"\"\n",
" This function \n",
" This function en\n",
" \"\"\"\n",
" # copy the error matrix (including the boundary)\n",
" encoded = np.copy(error).astype(int).astype(str).astype(object)\n",
......@@ -512,7 +512,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.11"
"version": "3.9.1"
}
},
"nbformat": 4,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment