Commit Graph

185 Commits (master)
 

Author SHA1 Message Date
J. Fernando Sánchez b41927d7bf remove leftover import in example 5 years ago
J. Fernando Sánchez 70d033b3a9 Update dockerignore 5 years ago
J. Fernando Sánchez 3afed06656 Add gitlab-ci 5 years ago
J. Fernando Sánchez 0a7ef27844 Added missing gexf for tests 5 years ago
J. Fernando Sánchez 2e28b36f6e Python3.7, testing and bug fixes
* Upgrade to python3.7 and pandas 0.3.4 because pandas has dropped support for
python 3.4 -> There are some API changes in pandas, and I've update the code
accordingly.
* Set pytest as the default test runner
5 years ago
J. Fernando Sánchez bd4700567e Update quickstart tutorial 5 years ago
J. Fernando Sánchez ff1df62eec All tests pass 5 years ago
J. Fernando Sánchez 9165979b49 merge visualization branch
The web server is included as a submodule.
The dependencies for the web (tornado) are not installed by default, but they
can be installed as an extra:

```
pip install soil[web]
```

Once installed, the soil web can be used like this:

```
soil-web

OR

python -m soil.web
```

There are other minor changes:

* History re-connects to the sqlite database if it is used from a different
thread.
* Environment accepts additional parameters (so it can run simulations with
`visualization_params` or any other in the future).
* The simulator class is no longer necessary
* Logging is done in the same thread, and the simulation is run in a separate
one. This had to be done because it was creating some problems with tornado not
being able to find the current thread during logs, which caused hundreds of
repeated lines in the web "console".
* The player is slightly modified in this version. I noticed that when the
  visualization was playing, if you clicked somewhere it would change for a
  second, and then go back to the previous place. The code for the playback
  seemed too complex, especially speed control, so I rewrote some parts. I
  might've introduced new bugs.
5 years ago
J. Fernando Sánchez 078f8ace9e Merge commit '8fec544772c13efb1dc8a0589240551b9bad27cb' as 'soil/web' 5 years ago
J. Fernando Sánchez 8fec544772 Squashed 'soil/web/' content from commit 4dcd0fc
git-subtree-dir: soil/web
git-subtree-split: 4dcd0fcb3d
5 years ago
J. Fernando Sánchez 5420501d36 Fix state and networkx dynamic attributes 6 years ago
J. Fernando Sánchez 5d89827ccf Fix history bug 6 years ago
J. Fernando Sánchez fc48ed7e09 Added history class
Now the environment does not deal with history directly, it delegates it to a
specific class. The analysis also uses history instances instead of either
using the database directly or creating a proxy environment.

This should make it easier to change the implementation in the future.

In fact, the change was motivated by the large size of the csv files in previous
versions. This new implementation only stores results in deltas, and it fills
any necessary values when needed.
6 years ago
J. Fernando Sánchez 73c90887e8 Fix pip installation 6 years ago
J. Fernando Sánchez 497c8a55db Add workaround for geometric models
Closes soil/soil#4
6 years ago
J. Fernando Sánchez 7d1c800490 Parallelism and granular exporting options
* Graphs are not saved by default (not backwards compatible)
* Modified newsspread examples
* More granular options to save results (exporting to CSV and GEXF are now
optional)
* Updated tutorial to include exporting options
* Removed references from environment to simulation
* Added parallelism to simulations (can be turned off with a flag or argument).
7 years ago
J. Fernando Sánchez a4b32afa2f Fix py3.4 and pypi bugs 7 years ago
J. Fernando Sánchez a7c51742f6 Improved docs
Fixed several bugs
Added convenience methods in soil.analysis
7 years ago
J. Fernando Sánchez 78364d89d5 Fix gephi representation. Add sqlite 7 years ago
J. Fernando Sánchez af76f54a28 Added rabbits 7 years ago
J. Fernando Sánchez dbc182c6d0 Compatibility with py3.4 7 years ago
J. Fernando Sánchez eafecc9e5e Make py3 compatibility explicit 7 years ago
J. Fernando Sánchez e8988015e2 Add more options to the command line 7 years ago
J. Fernando Sánchez ccc8e43416 Removed timeout from the simulation examples 7 years ago
J. Fernando Sánchez 347d295b09 Updated to match NetworkX's 2.0 API 7 years ago
J. Fernando Sánchez bbc5386cf5 Removed logo from header 7 years ago
J. Fernando Sánchez f8538fe057 Tidying up the repository 7 years ago
J. Fernando Sánchez e1be3a730e WIP soil
* Pandas integration
* Improved environment
* Logging and data dumps
* Tests
* Added Finite State Machine models
* Rewritten ipython notebook and documentation
7 years ago
Tasio Mendez 764177c634 Added dynamic graph.
Added dynamic graph to ControlModelM2.
7 years ago
Tasio Mendez cd9b7e096a Updated tutorial
Close #3
7 years ago
Tasio Mendez 5a2fcb5564 Merge fixed 7 years ago
Tasio Mendez 546ad0343b Merge branch 'models' of https://lab.cluster.gsi.dit.upm.es/soil/soil into models 7 years ago
Tasio Mendez a643735ddb All settings as JSON and documentation updated 7 years ago
Alberto Pascual 59ec790820 gexf now working, end value added 7 years ago
Tasio Mendez 23fc9671c3 Updated readthedocs 7 years ago
Tasio Mendez f1bb636ca8 Merge branch 'models' of https://lab.cluster.gsi.dit.upm.es/soil/soil into models 7 years ago
Alberto Pascual f8d8345d5a requirements added for faster install, settings separated in JSON file, now is possible to run different agent simulations at a time 7 years ago
Tasio Mendez c011943cef Started readthedocs 7 years ago
Tasio Mendez aaf5f709f1 Settings models 7 years ago
Tasio Mendez 391ce5e9e0 Changed models 7 years ago
Tasio Mendez 2fc7a91ef3 Settings modules 7 years ago
Tasio Mendez f29f5fa5bf Settings modules 7 years ago
Tasio Mendez dd4ce15a3d Separate models in modules 7 years ago
cif2cif d157a5e0b5 added JSON format 7 years ago
cif2cif d179c166ed changed typo 7 years ago
cif2cif 00e074faf3 added copyright 7 years ago
cif2cif ae0a0fa606 added logos 7 years ago
cif2cif a6fa31ad46 added logos 7 years ago
cif2cif 4d3b2e0738 Updated tutorial, install section and models 7 years ago
cif2cif aa187fffb1 Added GSI logo 7 years ago