Skip to content

I
image-compression
Commit e7d79230 authored by Kelly Chang's avatar Kelly Chang
Browse files
Options

solve coflict

parents fcbbeb88 a352868a
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
.ipynb_checkpoints/Encoding_decoding-checkpoint.ipynb
View file @ e7d79230
...@@ -307,7 +307,11 @@ ...@@ -307,7 +307,11 @@
"source": [ "source": [
"def encoder(error, list_dic, diff, bound, bins):\n", "def encoder(error, list_dic, diff, bound, bins):\n",
" \"\"\"\n", " \"\"\"\n",
<<<<<<< HEAD
" This function en\n", " This function en\n",
=======
" This function \n",
>>>>>>> a352868acf14cebeaa7ea2a58e879b1d36b066ad
" \"\"\"\n", " \"\"\"\n",
" # copy the error matrix (including the boundary)\n", " # copy the error matrix (including the boundary)\n",
" encoded = np.copy(error).astype(int).astype(str).astype(object)\n", " encoded = np.copy(error).astype(int).astype(str).astype(object)\n",
......
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