Updating to support WhizzML v0.33.1

whizzml · Jun 19, 2019 · 3531c04 · 3531c04
1 parent d24266d
commit 3531c04
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -59,4 +59,4 @@ whizzml.user.reserved_names().filter(function(p) {
 ```
 
 ## Current WhizzML Version supported
-    0.32.1 (05-28-2019)
+    0.33.1 (06-18-2019)
diff --git a/WhizzML.sublime-completions b/WhizzML.sublime-completions
@@ -225,6 +225,7 @@
         {"trigger": "mean", "contents": "mean"},
         {"trigger": "member?", "contents": "member?"},
         {"trigger": "merge", "contents": "merge"},
+        {"trigger": "merge-datasets", "contents": "merge-datasets"},
         {"trigger": "min\tCompute the minimum of", "contents": "min $1"},
         {"trigger": "min-key", "contents": "min-key"},
         {"trigger": "negative?\tCheck if negative", "contents": "negative? $1"},
@@ -268,6 +269,8 @@
         {"trigger": "resource-id", "contents": "resource-id"},
         {"trigger": "resource-id?\tCheck if resource ID", "contents": "resource-id? \"$1\""},
         {"trigger": "resource-ids\tGet resource IDs from list of maps", "contents": "resource-ids $1"},
+        {"trigger": "resource-name\tGet the name of the resource", "contents": "resource-name $1"},
+        {"trigger": "resource-property\tGet a resource property", "contents": "resource-property $1 $2 $3"},
         {"trigger": "resource-type\tGet resource-type from ID", "contents": "resource-type \"$1\""},
         {"trigger": "resource-workflow\tSummarizes the operations to reproduce a BigML resource", "contents": "resource-workflow $1 $2 $3"},
         {"trigger": "resources", "contents": "resources"},

diff --git a/WhizzML.sublime-syntax b/WhizzML.sublime-syntax
@@ -398,7 +398,7 @@ contexts:
       scope: support.function.whizzml
     - match: '(?<![*+!_?\-])\b(boolean|categorical-field|contains-string|contains|datetime-field|empty|even|every|field|integer|items-field|list|map|matches|member|negative|nil|number|numeric-field|odd|positive|procedure|real|regexp|resource-done|resource-id|set|string|text-field|zero)\?(?![*+!_?\-])'
       scope: support.function.tester.whizzml
-    - match: '(?<![*+!_?\-])\b(abort|abs|acos|add|and|append|apply|asin|assoc|assoc-in|atan|butlast|capitalize|ceil|chi-squared-test|compare-objects|concat|cons|cos|cosh|count|create|create|create-and-wait|create-and-wait-anomaly|create-and-wait-anomalyscore|create-and-wait-association|create-and-wait-associationset|create-and-wait-batchanomalyscore|create-and-wait-batchcentroid|create-and-wait-batchprediction|create-and-wait-batchprojection|create-and-wait-batchtopicdistribution|create-and-wait-centroid|create-and-wait-cluster|create-and-wait-composite|create-and-wait-configuration|create-and-wait-correlation|create-and-wait-dataset|create-and-wait-deepnet|create-and-wait-ensemble|create-and-wait-evaluation|create-and-wait-execution|create-and-wait-forecast|create-and-wait-fusion|create-and-wait-library|create-and-wait-linearregression|create-and-wait-logisticregression|create-and-wait-model|create-and-wait-optiml|create-and-wait-pca|create-and-wait-prediction|create-and-wait-project|create-and-wait-projection|create-and-wait-sample|create-and-wait-script|create-and-wait-source|create-and-wait-statisticaltest|create-and-wait-timeseries|create-and-wait-topicdistribution|create-and-wait-topicmodel|create-anomaly|create-anomalyscore|create-association|create-associationset|create-batchanomalyscore|create-batchcentroid|create-batchprediction|create-batchprojection|create-batchtopicdistribution|create-centroid|create-cluster|create-composite|create-correlation|create-configuration|create-dataset|create-dataset-split|create-deepnet|create-ensemble|create-evaluation|create-execution|create-forecast|create-fusion|create-library|create-linearregression|create-logisticregression|create-model|create-optiml|create-pca|create-prediction|create-project|create-projection|create-random-dataset-split|create-rng|create-sample|create-script|create-source|create-statisticaltest|create-timeseries|created-resources|create-topicdistribution|create-topicmodel|current-time|dataset-choose-objective-id|dataset-get-objective-id|define|delete|difference|dissoc|dissoc-in|div|drop|exp|fetch|filter|field-categories|field-distribution|field-items|field-optypes|field-terms|filter|find-field|flatline|flatline-listify|flatline-splice|flatline-str|flatline-str-splice|floor|for|gamma|get|get-in|handle|head|identity|insert|intersection|iterate|join|json-str|keys|lambda|last|levenshtein|list|list-anomalies|list-anomalyscores|list-associations|list-associationsets|list-batchanomalyscores|list-batchcentroids|list-batchpredictions|list-batchprojections|list-batchtopicdistributions|list-centroids|list-clusters|list-composites|list-configurations|list-correlations|list-datasets|list-deepnets|list-ensembles|list-evaluations|list-executions|list-forecasts|list-fusions|list-libraries|list-linearregressions|list-logisticregressions|list-models|list-optimls|list-pcas|list-predictions|list-projections|list-projects|list-samples|list-scripts|list-sources|list-statisticaltests|list-timeseries|list-topicdistributions|list-topicmodels|ln|log|log-debug|log-error|log-info|log-level|log-progress|log-warn|log10|log2|logged-progress|lower-case|make-map|map|matches|max|max-key|md5|mean|merge|min|min-key|not|nth|or|parse-resource-id|pow|ppr-str|pr-str|pretty-whizzml|prog|raise|rand|rand-int|rand-range|range|re-quote|read-number|reduce|rem|remove|remove-duplicates|repeat|repeatedly|replace|replace-first|replace-first-string|replace-string|resource-done?|resource-fields|resource-id|resource-id?|resource-ids|resource-type|resource-workflow|resources|reverse|round|row-distance|row-distance-squared|scriptify|select-keys|set-log-level|set-rng-seed|sha1|sha256|sin|sinh|smacdown--actual|smacdown--aggregate-predictions|smacdown--candidates|smacdown--data->dataset|smacdown--do-iteration|smacdown--evaluate|smacdown--expected|smacdown--get-id|smacdown--make-ensemble|smacdown--p-improvement|smacdown--predictions|smacdown--project|smacdown--schedule|smacdown--trees-in-ensemble|smacdown-optimize|some|sort|sort-by-key|split|split-regexp|sqrt|stdev|str|subs|subset|superset|tail|take|tan|tanh|to-degrees|to-radians|union|update|update-and-wait|upper-case|values|variance|version|version-major|version-micro|version-minor|wait|wait-forever|wait-forever*|when|with-time-log)\b(?![*+!_?\-])'
+    - match: '(?<![*+!_?\-])\b(abort|abs|acos|add|and|append|apply|asin|assoc|assoc-in|atan|butlast|capitalize|ceil|chi-squared-test|compare-objects|concat|cons|cos|cosh|count|create|create|create-and-wait|create-and-wait-anomaly|create-and-wait-anomalyscore|create-and-wait-association|create-and-wait-associationset|create-and-wait-batchanomalyscore|create-and-wait-batchcentroid|create-and-wait-batchprediction|create-and-wait-batchprojection|create-and-wait-batchtopicdistribution|create-and-wait-centroid|create-and-wait-cluster|create-and-wait-composite|create-and-wait-configuration|create-and-wait-correlation|create-and-wait-dataset|create-and-wait-deepnet|create-and-wait-ensemble|create-and-wait-evaluation|create-and-wait-execution|create-and-wait-forecast|create-and-wait-fusion|create-and-wait-library|create-and-wait-linearregression|create-and-wait-logisticregression|create-and-wait-model|create-and-wait-optiml|create-and-wait-pca|create-and-wait-prediction|create-and-wait-project|create-and-wait-projection|create-and-wait-sample|create-and-wait-script|create-and-wait-source|create-and-wait-statisticaltest|create-and-wait-timeseries|create-and-wait-topicdistribution|create-and-wait-topicmodel|create-anomaly|create-anomalyscore|create-association|create-associationset|create-batchanomalyscore|create-batchcentroid|create-batchprediction|create-batchprojection|create-batchtopicdistribution|create-centroid|create-cluster|create-composite|create-correlation|create-configuration|create-dataset|create-dataset-split|create-deepnet|create-ensemble|create-evaluation|create-execution|create-forecast|create-fusion|create-library|create-linearregression|create-logisticregression|create-model|create-optiml|create-pca|create-prediction|create-project|create-projection|create-random-dataset-split|create-rng|create-sample|create-script|create-source|create-statisticaltest|create-timeseries|created-resources|create-topicdistribution|create-topicmodel|current-time|dataset-choose-objective-id|dataset-get-objective-id|define|delete|difference|dissoc|dissoc-in|div|drop|exp|fetch|filter|field-categories|field-distribution|field-items|field-optypes|field-terms|filter|find-field|flatline|flatline-listify|flatline-splice|flatline-str|flatline-str-splice|floor|for|gamma|get|get-in|handle|head|identity|insert|intersection|iterate|join|json-str|keys|lambda|last|levenshtein|list|list-anomalies|list-anomalyscores|list-associations|list-associationsets|list-batchanomalyscores|list-batchcentroids|list-batchpredictions|list-batchprojections|list-batchtopicdistributions|list-centroids|list-clusters|list-composites|list-configurations|list-correlations|list-datasets|list-deepnets|list-ensembles|list-evaluations|list-executions|list-forecasts|list-fusions|list-libraries|list-linearregressions|list-logisticregressions|list-models|list-optimls|list-pcas|list-predictions|list-projections|list-projects|list-samples|list-scripts|list-sources|list-statisticaltests|list-timeseries|list-topicdistributions|list-topicmodels|ln|log|log-debug|log-error|log-info|log-level|log-progress|log-warn|log10|log2|logged-progress|lower-case|make-map|map|matches|max|max-key|md5|mean|merge|merge-datasets|min|min-key|not|nth|or|parse-resource-id|pow|ppr-str|pr-str|pretty-whizzml|prog|raise|rand|rand-int|rand-range|range|re-quote|read-number|reduce|rem|remove|remove-duplicates|repeat|repeatedly|replace|replace-first|replace-first-string|replace-string|resource-done?|resource-fields|resource-id|resource-id?|resource-ids|resource-name|resource-property|resource-type|resource-workflow|resources|reverse|round|row-distance|row-distance-squared|scriptify|select-keys|set-log-level|set-rng-seed|sha1|sha256|sin|sinh|smacdown--actual|smacdown--aggregate-predictions|smacdown--candidates|smacdown--data->dataset|smacdown--do-iteration|smacdown--evaluate|smacdown--expected|smacdown--get-id|smacdown--make-ensemble|smacdown--p-improvement|smacdown--predictions|smacdown--project|smacdown--schedule|smacdown--trees-in-ensemble|smacdown-optimize|some|sort|sort-by-key|split|split-regexp|sqrt|stdev|str|subs|subset|superset|tail|take|tan|tanh|to-degrees|to-radians|union|update|update-and-wait|upper-case|values|variance|version|version-major|version-micro|version-minor|wait|wait-forever|wait-forever*|when|with-time-log)\b(?![*+!_?\-])'
       scope: support.function.whizzml
     - match: '(?<![*+!_?\-])\b(true|false)\b(?![*+!_?\-])'
       scope: constant.language.whizzml

diff --git a/whizzml_primitives.txt b/whizzml_primitives.txt
@@ -3,7 +3,7 @@
 /* Use this file to list WhizzML primitives and check
 /* updates in the original list.
 /*
-/* WhizzML Version: 0.32.1
+/* WhizzML Version: 0.33.1
 /*********************************************************/
 !=
 *
@@ -240,6 +240,7 @@ md5
 mean
 member?
 merge
+merge-datasets
 min
 min-key
 negative?
@@ -283,6 +284,8 @@ resource-fields
 resource-id
 resource-id?
 resource-ids
+resource-name
+resource-property
 resource-type
 resource-workflow
 resources