Skip to content

Commit

Permalink
Spelling correction
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidPratten committed Dec 30, 2022
1 parent 4a4c746 commit e5f22b8
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions ACT_Conveyance_Duty.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"cells": [
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 2,
"outputs": [],
"source": [
"%reload_ext jetisu.query_idr_magic"
Expand Down Expand Up @@ -79,7 +79,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": 3,
"outputs": [
{
"data": {
Expand Down Expand Up @@ -111,7 +111,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 4,
"outputs": [
{
"data": {
Expand Down Expand Up @@ -147,7 +147,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": 5,
"outputs": [
{
"data": {
Expand Down Expand Up @@ -181,7 +181,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 6,
"outputs": [
{
"data": {
Expand Down Expand Up @@ -216,7 +216,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": 7,
"outputs": [
{
"data": {
Expand Down Expand Up @@ -249,7 +249,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": 8,
"outputs": [
{
"data": {
Expand Down Expand Up @@ -288,18 +288,19 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": 9,
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"UsageError: Cell magic `%%sjetisu_show` not found.\n"
]
"data": {
"text/plain": "<IPython.core.display.Markdown object>",
"text/markdown": "```\n\npredicate units(var int:amount, \n var int:unit_size, \n var bool: round_up, \n var int:units ) = \nlet {\n constraint units = amount div unit_size + if round_up then amount mod unit_size > 0 else 0 endif;\n} in true;\n\n\n\npredicate act_conveyance_duty(var bool: non_commercial, \n var bool: eligible_owner_occupier, \n var int:price, \n var float:duty) = \nlet {\n constraint eligible_owner_occupier -> non_commercial;\n constraint price >= 0;\n constraint duty >= 0;\n var int: num_units;\n int: unit = 100;\n constraint duty = \n if non_commercial then\n if eligible_owner_occupier then\n if price > 0 /\\ price <=260000 \n /\\ units(price, unit, true, num_units) then num_units * 60 else \n if price > 260000 /\\ price <=300000 \n /\\ units(price-260000, unit, true, num_units) then 1560.00 + num_units * 2.20 else \n if price > 300000 /\\ price <=500000 \n /\\ units(price-300000, unit, true, num_units) then 2440.00 + num_units * 3.40 else \n if price > 500000 /\\ price <=750000 \n /\\ units(price-500000, unit, true, num_units) then 9240.00 + num_units * 4.32 else \n if price > 750000 /\\ price <=1000000 \n /\\ units(price-750000, unit, true, num_units) then 20040.00 + num_units * 5.90 else \n if price > 1000000 /\\ price <=1455000 \n /\\ units(price-1000000, unit, true, num_units) then 34790.00 + num_units * 6.40 else \n if price > 1445000 \n /\\ units(price, unit, true, num_units) then num_units * 4.54 \n else -1 endif endif endif endif endif endif endif\n else % not eligible_owner_occupier\n if price > 0 /\\ price <=200000 \n /\\ units(price, unit, true, num_units) then num_units * 120 else \n if price > 200000 /\\ price <=300000 \n /\\ units(price-200000, unit, true, num_units) then 2400.00 + num_units * 2.20 else \n if price > 300000 /\\ price <=500000 \n /\\ units(price-300000, unit, true, num_units) then 4600.00 + num_units * 3.40 else \n if price > 500000 /\\ price <=750000 \n /\\ units(price-500000, unit, true, num_units) then 11400.00 + num_units * 4.32 else \n if price > 750000 /\\ price <=1000000 \n /\\ units(price-750000, unit, true, num_units) then 22200.00 + num_units * 5.90 else \n if price > 1000000 /\\ price <=1455000 \n /\\ units(price-1000000, unit, true, num_units) then 36950.00 + num_units * 6.40 else \n if price > 1445000 \n /\\ units(price, unit, true, num_units) then num_units * 4.54 \n else -1 endif endif endif endif endif endif endif\n endif\n else % commercial\n if price > 0 /\\ price <= 1700000 then 0 else\n if price > 1700000 \n /\\ units(price, unit, true, num_units) then num_units * 5.00 else -1 endif endif\n endif\n} \nin true;\n```"
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [
"%%sjetisu_show\n",
"%%jetisu_show\n",
"ACT_Conveyance_Duty"
],
"metadata": {
Expand All @@ -308,7 +309,7 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 9,
"outputs": [],
"source": [],
"metadata": {
Expand Down

0 comments on commit e5f22b8

Please sign in to comment.