Skip to content

Commit a43d34d

Browse files
authored
Merge pull request #38 from giswqs/develop
Updated backend to v2.2.0
2 parents 1878f42 + 6af195e commit a43d34d

32 files changed

+924
-154
lines changed

WBT/PRE/automation.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,8 @@ def get_book_tag(tool_name, category):
560560
"""
561561
if 'f"={toolname}"' in line:
562562
line = ' args.append("={}".format(toolname))'
563+
if line.strip() == 'args2.append(f"--max_procs={val}")':
564+
line = ' args2.append("--max_procs={}".format(val))'
563565
if 'f"Warning: Unrecognized extension ext_name {ext_name}' in line:
564566
line = ' print("Warning: Unrecognized extension ext_name {}. Installing the GTE instead...".format(ext_name))\n'
565567
if line.strip() == "for entry in os.scandir(f'./{unzipped_dir_name}'):":

WBT/UserManual.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The WhiteboxTools User Manual is now available online at:
22

3-
https://www.whiteboxgeo.com/manual/wbt_book/index.html
3+
https://www.whiteboxgeo.com/manual/wbt_book/preface.html
44

55
Please see the manual for details on usage and for descriptions of available tools.
66
The PDF version of the User Manual is no longer distributed along with the software.

WBT/img/WhiteboxToolsLogo_box_only.svg

Lines changed: 99 additions & 111 deletions
Loading
32.8 KB
Loading
32.9 KB
Loading
32.8 KB
Loading
33 KB
Loading
4 KB
Binary file not shown.
3.25 MB
Binary file not shown.
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"tool_name": "ConditionedLatinHypercube",
3+
"exe": "conditioned_latin_hypercube",
4+
"short_description": "Implements conditioned Latin Hypercube sampling.",
5+
"toolbox": "Math and Stats Tools",
6+
"license": "MIT",
7+
"example": ".*EXE_NAME run -i=Raster1.tif;Raster2.tif --output=sites.shp --samples=500",
8+
"parameters": [
9+
{
10+
"name": "Input Raster",
11+
"flags": ["-i", "--inputs"],
12+
"description": "Name of the input raster file",
13+
"parameter_type": {"FileList":{"ExistingFile":"Raster"}},
14+
"default_value": null,
15+
"optional": false
16+
},
17+
{
18+
"name": "Output shapefile",
19+
"flags": ["-o", "--output"],
20+
"description": "Output shapefile",
21+
"parameter_type": {"NewFile":{"Vector":"Point"}},
22+
"default_value": null,
23+
"optional": false
24+
},
25+
{
26+
"name": "Number of sample sites",
27+
"flags": ["--samples"],
28+
"description": "Number of sample sites returned",
29+
"parameter_type": "Integer",
30+
"default_value": "500",
31+
"optional": true
32+
},
33+
{
34+
"name": "Number of resampling iterations",
35+
"flags": ["--iterations"],
36+
"description": "Maximum iterations (if stopping criteria not reached).",
37+
"parameter_type": "Integer",
38+
"default_value": "25000",
39+
"optional": true
40+
},
41+
{
42+
"name": "RNG seed",
43+
"flags": ["--seed"],
44+
"description": "Seed for RNG consistency",
45+
"parameter_type": "Integer",
46+
"default_value": null,
47+
"optional": true
48+
},
49+
{
50+
"name": "Random resample probability",
51+
"flags": ["--prob"],
52+
"description": "Probability of random resample or resampling worst strata between [0,1].",
53+
"parameter_type": "Float",
54+
"default_value": "0.5",
55+
"optional": true
56+
},
57+
{
58+
"name": "Objective function threshold.",
59+
"flags": ["--threshold"],
60+
"description": "Objective function values below the theshold stop the resampling iterations.",
61+
"parameter_type": "Float",
62+
"default_value": null,
63+
"optional": true
64+
},
65+
{
66+
"name": "Initial annealing temperature",
67+
"flags": ["--temp"],
68+
"description": "Initial annealing temperature between [0,1].",
69+
"parameter_type": "Float",
70+
"default_value": "1.0",
71+
"optional": true
72+
},
73+
{
74+
"name": "Temperature decay factor",
75+
"flags": ["--temp_decay"],
76+
"description": "Annealing temperature decay proportion between [0,1]. Reduce temperature by this proportion each annealing cycle.",
77+
"parameter_type": "Float",
78+
"default_value": "0.05",
79+
"optional": true
80+
},
81+
{
82+
"name": "Annealing cycle duration",
83+
"flags": ["--cycle"],
84+
"description": "Number of iterations before decaying annealing temperature.",
85+
"parameter_type": "Integer",
86+
"default_value": "10",
87+
"optional": true
88+
},
89+
{
90+
"name": "Average the continuous Obj. Func.",
91+
"flags": ["--average"],
92+
"description": "Weight the continuous objective funtion by the 1/N contributing strata.",
93+
"parameter_type": "Boolean",
94+
"default_value": "false",
95+
"optional": true
96+
}
97+
]
98+
}

0 commit comments

Comments
 (0)