diff --git a/.gitignore b/.gitignore index a9e45ba..93f9edb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ results *.csv *.txt simulations/.ipynb_checkpoints +dist/SimCAD-0.1.tar.gz build SimCAD.egg-info \ No newline at end of file diff --git a/README.md b/README.md index a5c1aa7..b56fea1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ A/B testing policies, monte carlo analysis and other common numerical methods is **1. Install Dependencies:** ```bash pip install -r requirements.txt -pip install -e . +python3 setup.py sdist bdist_wheel ``` **2. Configure Simulation:** @@ -33,25 +33,19 @@ Examples: **3. Import SimCAD & Run Simulation:** Example: -`/demos/sim_test.py` or `test.ipynb` +`/simulations/sim_test.py` or `/simulations/test.ipynb` ```python import pandas as pd from tabulate import tabulate - -# The following imports NEED to be in the exact same order - +# The following imports NEED to be in the exact order from SimCAD.engine import ExecutionMode, ExecutionContext, Executor -from simulations.validation import config1, config2 +from validation import config1, config2 from SimCAD import configs - -# ToDo: pass ExecutionContext with execution method as ExecutionContext input - exec_mode = ExecutionMode() - print("Simulation Execution 1") print() first_config = [configs[0]] # from config1 @@ -59,7 +53,6 @@ single_proc_ctx = ExecutionContext(context=exec_mode.single_proc) run1 = Executor(exec_context=single_proc_ctx, configs=first_config) run1_raw_result, tensor_field = run1.main() result = pd.DataFrame(run1_raw_result) - print() print("Tensor Field:") print(tabulate(tensor_field, headers='keys', tablefmt='psql')) diff --git a/dist/SimCAD-0.1-py3-none-any.whl b/dist/SimCAD-0.1-py3-none-any.whl index 070c329..10b79b5 100644 Binary files a/dist/SimCAD-0.1-py3-none-any.whl and b/dist/SimCAD-0.1-py3-none-any.whl differ diff --git a/dist/SimCAD-0.1.tar.gz b/dist/SimCAD-0.1.tar.gz deleted file mode 100644 index fa62ddc..0000000 Binary files a/dist/SimCAD-0.1.tar.gz and /dev/null differ diff --git a/simulations/sim_test.py b/simulations/sim_test.py index ae58ba4..3a18378 100644 --- a/simulations/sim_test.py +++ b/simulations/sim_test.py @@ -3,12 +3,11 @@ from tabulate import tabulate # The following imports NEED to be in the exact order from SimCAD.engine import ExecutionMode, ExecutionContext, Executor -from simulations.validation import config1, config2 +from validation import config1, config2 from SimCAD import configs exec_mode = ExecutionMode() - print("Simulation Execution 1") print() first_config = [configs[0]] # from config1 @@ -34,4 +33,4 @@ for raw_result, tensor_field in run2.main(): print(tabulate(tensor_field, headers='keys', tablefmt='psql')) print("Output:") print(tabulate(result, headers='keys', tablefmt='psql')) - print() \ No newline at end of file + print() diff --git a/simulations/test.ipynb b/simulations/test.ipynb index b281b65..8f8415a 100644 --- a/simulations/test.ipynb +++ b/simulations/test.ipynb @@ -7,6 +7,7 @@ "outputs": [], "source": [ "import pandas as pd\n", + "from tabulate import tabulate\n", "\n", "# The following imports NEED to be in the exact order\n", "from SimCAD.engine import ExecutionMode, ExecutionContext, Executor\n",