Compare commits

..

No commits in common. "6e1f478ce54f7ba1f80966d58833bcde87607693" and "c57b71cd763879bd121709d090e3058b322013ae" have entirely different histories.

23 changed files with 47 additions and 87 deletions

1
.gitignore vendored
View File

@ -30,5 +30,4 @@ yarn.lock
package-lock.json package-lock.json
dist dist
.temp .temp
filebrowser.db

View File

@ -10,4 +10,4 @@ It's a good place to start if you want to have an overview of ThreeFold since it
- [ThreeFold Tech](threefold_tech.md) - [ThreeFold Tech](threefold_tech.md)
- [Organisation Structure](orgstructure.md) - [Organisation Structure](orgstructure.md)
- [ThreeFold Roadmap](roadmap_readme.md) - [ThreeFold Roadmap](roadmap_readme.md)
- [ThreeFold Token](token_overview.md) - [ThreeFold Token](token_overview.md)

View File

@ -3,7 +3,7 @@
## PLATINUM ## PLATINUM
```js ```js
!!tfgrid_simulator.node_define !!tfgrid4_node.define
name:'platinum' name:'platinum'
cpu_brand:'amd' cpu_brand:'amd'
cpu_version:'9600' cpu_version:'9600'
@ -23,7 +23,7 @@
// Define the CloudBox // Define the CloudBox
!!tfgrid_simulator.cloudbox_define !!tfgrid4_node.cloudbox_define
node:'platinum' node:'platinum'
amount:15 amount:15
description:'' description:''
@ -35,7 +35,7 @@
vcores:2 vcores:2
// Define the StorageBox // Define the StorageBox
!!tfgrid_simulator.storagebox_define !!tfgrid4_node.storagebox_define
node:'platinum' node:'platinum'
amount:100 amount:100
description:'' description:''
@ -46,7 +46,7 @@
## AI ## AI
```js ```js
!!tfgrid_simulator.node_define !!tfgrid4_node.define
name:'ai' name:'ai'
cpu_brand:'amd' cpu_brand:'amd'
cpu_version:'9600' cpu_version:'9600'
@ -65,7 +65,7 @@
grant_max_nrnodes:1000 //max nr of nodes which will get this grant grant_max_nrnodes:1000 //max nr of nodes which will get this grant
!!tfgrid_simulator.aibox_define !!tfgrid4_node.aibox_define
node:'ai' node:'ai'
amount:1 amount:1
gpu_brand:'Nvidia GeForce' gpu_brand:'Nvidia GeForce'
@ -79,7 +79,7 @@
storage_gb:1800 storage_gb:1800
vcores:24 vcores:24
!!tfgrid_simulator.storagebox_define !!tfgrid4_node.storagebox_define
node:'ai' node:'ai'
amount:100 amount:100
description:'' description:''
@ -90,7 +90,7 @@
## SILVER ## SILVER
```js ```js
!!tfgrid_simulator.node_define !!tfgrid4_node.define
name:'silver' name:'silver'
cpu_brand:'intel' cpu_brand:'intel'
cpu_version:'N96 12e gen' cpu_version:'N96 12e gen'
@ -110,7 +110,7 @@
grant_max_nrnodes:5000 //max nr of nodes which will get this grant grant_max_nrnodes:5000 //max nr of nodes which will get this grant
!!tfgrid_simulator.cloudbox_define !!tfgrid4_node.cloudbox_define
node:'silver' node:'silver'
amount:4 amount:4
description:'' description:''

View File

@ -3,7 +3,7 @@
not used yet. not used yet.
```js ```js
// !!tfgrid_simulator.rewards_define // !!tfgrid4_simulator.rewards_define
// inca_grant_new_user_usd:'1:20,12:0' // inca_grant_new_user_usd:'1:20,12:0'
// inca_grant_new_user_inca:'1:20,12:0' // inca_grant_new_user_inca:'1:20,12:0'
// inca_grant_month_usd:'1:20,12:0' // inca_grant_month_usd:'1:20,12:0'

View File

@ -1,21 +1,21 @@
## growth simulation ## growth simulation
```js ```js
!!tfgrid_simulator.node_growth_define !!tfgrid4_simulator.node_growth_define
node_name:'silver' node_name:'silver'
new_month:'0:20,30:5000' new_month:'0:20,30:5000'
churn:2 //in percent 0..100 churn:2 //in percent 0..100
utilization:'0:0,20:70' //in percent 0..100 utilization:'0:0,20:70' //in percent 0..100
discount:'0:0,60:30' //in percent 0..100 discount:'0:0,60:30' //in percent 0..100
!!tfgrid_simulator.node_growth_define !!tfgrid4_simulator.node_growth_define
node_name:'platinum' node_name:'platinum'
new_month:'0:20,50:200' new_month:'0:20,50:200'
churn:2 //in percent 0..100 churn:2 //in percent 0..100
utilization:'0:0,20:70' //in percent 0..100 utilization:'0:0,20:70' //in percent 0..100
discount:'0:0,60:30' //in percent 0..100 discount:'0:0,60:30' //in percent 0..100
!!tfgrid_simulator.node_growth_define !!tfgrid4_simulator.node_growth_define
node_name:'ai' node_name:'ai'
new_month:'0:20,30:100' new_month:'0:20,30:100'
churn:2 //in percent 0..100 churn:2 //in percent 0..100
@ -23,11 +23,11 @@
discount:'0:0,60:30' //in percent 0..100 discount:'0:0,60:30' //in percent 0..100
!!tfgrid_simulator.incaprice_define !!tfgrid4_simulator.incaprice_define
incaprice_usd:'0:0.05,12:0.3,24:0.5,60:2' incaprice_usd:'0:0.05,12:0.3,24:0.5,60:2'
!!tfgrid_simulator.run name:'run1' !!tfgrid4_simulator.run name:run1

View File

@ -1,12 +0,0 @@
#!/bin/bash
set -ex
#~/code/github/freeflowuniverse/crystallib/cli/hero/compile_debug.sh
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming
#result will be in /root/hero/var/mdbuild/tfgrid4simulator
#~/hero/www/info/tfgrid4simulator/
#https://threefold.info/tfgrid4simulator/

View File

@ -1 +0,0 @@
../../heroscript/tfgridsimulation_farming/SUMMARY.md

View File

@ -1 +0,0 @@
tf_intro.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 KiB

View File

@ -1,11 +1,3 @@
![](img/tf_intro.png) ![](img/cloud.png)
## Simulator for TFGrid 4.x ## Simulator for TFGrid 4.x
This simulator has been created to allow people to experiment with the economic principles behind the TFGrid.
In version 4 we changed the principles to make it easier to reach millions of nodes in the field.
More information about threefold see: [https://www.threefold.io/host/](https://www.threefold.io/host/)

View File

@ -1,5 +0,0 @@
!!!tfgridsimulation_farming.node_wiki name:'1u'

View File

@ -0,0 +1,4 @@
!!tfgridsimulation_farming.node_wiki name:...

View File

@ -1,5 +0,0 @@
## Regional Internets
!!!tfgridsimulation_farming.regionalinternet_wiki name:'znz'

View File

@ -0,0 +1,12 @@
## parameters for the simulation
```js
!!tfgridsimulation_farming.simulator_params_define
wiki_path: '/tmp/simulatorwiki'
```

View File

@ -1,15 +1,15 @@
## cultivation parameters for the simulation ## cultivation parameters for the simulation
```js ```js
!!tfgridsimulation_farming.cultivation_params_define !!tfgridsimulation_farming.cultivation_params_define
utilization_nodes: '1:0,24:70' //how much in percentage are nodes used (0-100) //how much in percentage are nodes used (0-100)
revenue_per_cu_usd: '1:5,60:4' //revenue per cloud units utilization_nodes: '1:0,24:70'
revenue_per_cu_usd: '1:5,60:4'
revenue_per_su_usd: '1:5,60:3' revenue_per_su_usd: '1:5,60:3'
revenue_per_nu_usd: '1:0.01,60:0.005' revenue_per_nu_usd: '1:0.01,60:0.005'
cost_per_cu_usd: '1:0' //is there a cost for the units, here no cost_per_cu_usd: '1:0'
cost_per_su_usd: '1:0' cost_per_su_usd: '1:0'
cost_per_nu_usd: '1:0.005,60:0.0025' //for networking there is a cost cost_per_nu_usd: '1:0.005,60:0.0025'
``` ```

View File

@ -5,7 +5,7 @@
```js ```js
!!tfgridsimulation_farming.environment_params_define !!tfgridsimulation_farming.environment_params_define
//power cost per khw //power cost per khw
power_cost: '1:0.15,60:0.25' power_cost: '1:0.06,60:0.15'
//rackspace cost per U in USD //rackspace cost per U in USD
rackspace_cost: '1:10,60:5' rackspace_cost: '1:10,60:5'

View File

@ -4,13 +4,14 @@
This is a normalized node for our simulator This is a normalized node for our simulator
Following defines the Bill of Material and composition of such a node Following defines the Bill of Material and composition of such a noce
```js ```js
!!tfgridsimulation_farming.component_define name:AMD32 !!tfgridsimulation_farming.component_define name:AMD32
description: 'powerful amd cpu' description: 'powerful amd cpu'
cost:250.0 cost:250.0
power:70 //in watt //in watt
power:70
cru:32 cru:32
!!tfgridsimulation_farming.component_define name:CASE1U !!tfgridsimulation_farming.component_define name:CASE1U
@ -32,7 +33,6 @@ Following defines the Bill of Material and composition of such a node
sru:1000 sru:1000
!!tfgridsimulation_farming.node_template_define name:'1U' !!tfgridsimulation_farming.node_template_define name:'1U'
image:'projectinca:inca_node_silver_2.png'
!!tfgridsimulation_farming.node_template_component_add name:'1U' nr:1 component:AMD32 !!tfgridsimulation_farming.node_template_component_add name:'1U' nr:1 component:AMD32
!!tfgridsimulation_farming.node_template_component_add name:'1U' nr:1 component:CASE1U !!tfgridsimulation_farming.node_template_component_add name:'1U' nr:1 component:CASE1U

View File

@ -1,13 +0,0 @@
## the runner
This page triggers the full simulation
```js
!!tfgridsimulation_farming.run //this one will make sure the simulator is run
```

View File

@ -1,7 +0,0 @@
![](img/tf_intro.png)
# Specifications
In this section you can change the paramters of a simulation.

View File

@ -12,4 +12,4 @@ It is a must to democratize the Internet.
Some companies have access to the data of hundreds of millions of citizens, this makes us a product. Some companies have access to the data of hundreds of millions of citizens, this makes us a product.
![alt text](not_internet_losses.png) ![alt text](not_internet_losses.png)

View File

@ -1,4 +1 @@
- [Introduction](tfgridsimulation_farming/intro.md) - [Introduction](tfgridsimulation_farming/intro.md)
- [Specifications](tfgridsimulation_farming/specification.md)
- [Node 1U](tfgridsimulation_farming/node_1u.md)
- [regionalinternet.md](tfgridsimulation_farming/regionalinternet.md)

View File

@ -2,7 +2,7 @@
```js ```js
!!book.generate name:'tfgridsimulation_farming' title:'TFGrid Simulator 4.0 - Farming' !!book.generate name:'tfgrid4simulator' title:'TFGrid Simulator 4.0'
url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming' url:'https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming'

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
#~/code/github/freeflowuniverse/crystallib/cli/hero/compile_debug.sh ~/code/github/freeflowuniverse/crystallib/cli/hero/compile_debug.sh
hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming -o hero mdbook -u https://git.ourworld.tf/tfgrid/info_tfgrid/src/branch/development/heroscript/tfgridsimulation_farming -o