diff --git a/vocabularies/Analytics.json b/vocabularies/Analytics.json index 74c2a8d4..dc56c1e8 100644 --- a/vocabularies/Analytics.json +++ b/vocabularies/Analytics.json @@ -172,7 +172,7 @@ "$IsBound": true, "@Common.Experimental": true, "@Core.Description": "`$apply` transformation that expands an unnamed leveled hierarchy with custom aggregation of certain properties", - "@Core.LongDescription": "Example transformation sequence:\nfilter on columns `Industry`, `Amount` and `Currency`,\norder by `Amount` descending,\nshow 2 levels, with two exceptions\n```\n$apply=filter(Industry in ('IT','AI'))\n/groupby((Country,Region,Segment,Industry),\n filter($these/aggregate(Amount) gt 0 and\n $these/aggregate(Currency) ne null))\n/concat(\n groupby((Country,Region,Segment,Industry))\n /aggregate($count as LeavesCount),\n aggregate(Amount,Currency),\n Analytics.MultiLevelExpand(\n Levels=[{\"D\":[\"Country\"],\"A\":[\"CountryName\"]},\n {\"D\":[\"Region\"],\"A\":[\"RegionName\"]},\n {\"D\":[\"Segment\",\"Industry\"],\"A\":[]}],\n Aggregation=[\"Amount\",\"Currency\"],\n SiblingOrder=[{\"Property\":\"Amount\",\"Descending\":true}],\n ShowLevels=2,\n ExpandEntries=[{\"Entry\":[\"US\"],\"Levels\":0},\n {\"Entry\":[\"DE\",\"BW\"],\"Levels\":1}]\n )/concat(aggregate($count as ResultEntriesCount),\n skip(20)/top(10)))\n```\n", + "@Core.LongDescription": "Example transformation sequence:\nfilter on columns `Industry`, `Amount` and `Currency`,\norder by `Amount` descending,\nshow 2 levels, with two exceptions\n```\n$apply=filter(Industry in ('IT','AI'))\n/groupby((Country,Region,Segment,Industry),\n filter($these/aggregate(Amount) gt 0 and\n $these/aggregate(Currency) ne null))\n/concat(\n groupby((Country,Region,Segment,Industry))\n /aggregate($count as LeavesCount),\n aggregate(Amount,Currency),\n Analytics.MultiLevelExpand(\n Levels=[{\"DimensionProperties\":[\"Country\"],\"AdditionalProperties\":[\"CountryName\"]},\n {\"DimensionProperties\":[\"Region\"],\"AdditionalProperties\":[\"RegionName\"]},\n {\"DimensionProperties\":[\"Segment\",\"Industry\"],\"AdditionalProperties\":[]}],\n Aggregation=[\"Amount\",\"Currency\"],\n SiblingOrder=[{\"Property\":\"Amount\",\"Descending\":true}],\n ShowLevels=2,\n ExpandEntries=[{\"Entry\":[\"US\"],\"Levels\":0},\n {\"Entry\":[\"DE\",\"BW\"],\"Levels\":1}]\n )/concat(aggregate($count as ResultEntriesCount),\n skip(20)/top(10)))\n```\n", "$Parameter": [ { "$Name": "InputSet", @@ -231,14 +231,14 @@ "$Kind": "ComplexType", "@Common.Experimental": true, "@Core.Description": "Property names constituting a level in an [unnamed leveled hierarchy](#MultiLevelExpand)", - "@Core.LongDescription": "Properties in `D` must be used to identify entries in [`ExpandEntries/Entry`](#MultiLevelExpandEntry),\n otherwise they have the same effect as properties in `A`.", - "D": { + "@Core.LongDescription": "`DimensionProperties` must be used to identify entries in [`ExpandEntries/Entry`](#MultiLevelExpandEntry),\n otherwise they have the same effect as `AdditionalProperties`.", + "DimensionProperties": { "$Collection": true, "@Core.Description": "A non-empty set of property names that define a combination of dimension values" }, - "A": { + "AdditionalProperties": { "$Collection": true, - "@Core.Description": "A possibly empty set of names of additional properties of the dimensions that occur in `D`" + "@Core.Description": "A possibly empty set of names of additional properties of the dimensions that occur in `DimensionProperties`" } }, "MultiLevelExpandSiblingOrder": { @@ -258,7 +258,7 @@ "@Core.Description": "Expansion state of an entry in an [unnamed leveled hierarchy](#MultiLevelExpand)", "Entry": { "$Collection": true, - "@Core.Description": "An entry on a given [level](#MultiLevelExpandLevel) is identified by a collection of values for the `D` properties that constitute all levels up to and including the given one" + "@Core.Description": "An entry on a given [level](#MultiLevelExpandLevel) is identified by a collection of values for the `DimensionProperties` that constitute all levels up to and including the given one" }, "Levels": { "$Type": "Edm.Int64", diff --git a/vocabularies/Analytics.md b/vocabularies/Analytics.md index e7d62e88..98469e98 100644 --- a/vocabularies/Analytics.md +++ b/vocabularies/Analytics.md @@ -41,9 +41,9 @@ $apply=filter(Industry in ('IT','AI')) /aggregate($count as LeavesCount), aggregate(Amount,Currency), Analytics.MultiLevelExpand( - Levels=[{"D":["Country"],"A":["CountryName"]}, - {"D":["Region"],"A":["RegionName"]}, - {"D":["Segment","Industry"],"A":[]}], + Levels=[{"DimensionProperties":["Country"],"AdditionalProperties":["CountryName"]}, + {"DimensionProperties":["Region"],"AdditionalProperties":["RegionName"]}, + {"DimensionProperties":["Segment","Industry"],"AdditionalProperties":[]}], Aggregation=["Amount","Currency"], SiblingOrder=[{"Property":"Amount","Descending":true}], ShowLevels=2, @@ -96,13 +96,13 @@ Property|Type|Description ## [MultiLevelExpandLevel](Analytics.xml#L265) *([Experimental](Common.md#Experimental))* Property names constituting a level in an [unnamed leveled hierarchy](#MultiLevelExpand) -Properties in `D` must be used to identify entries in [`ExpandEntries/Entry`](#MultiLevelExpandEntry), - otherwise they have the same effect as properties in `A`. +`DimensionProperties` must be used to identify entries in [`ExpandEntries/Entry`](#MultiLevelExpandEntry), + otherwise they have the same effect as `AdditionalProperties`. Property|Type|Description :-------|:---|:---------- -[D](Analytics.xml#L272)|\[String\]|A non-empty set of property names that define a combination of dimension values -[A](Analytics.xml#L275)|\[String\]|A possibly empty set of names of additional properties of the dimensions that occur in `D` +[DimensionProperties](Analytics.xml#L272)|\[String\]|A non-empty set of property names that define a combination of dimension values +[AdditionalProperties](Analytics.xml#L275)|\[String\]|A possibly empty set of names of additional properties of the dimensions that occur in `DimensionProperties` ## [MultiLevelExpandSiblingOrder](Analytics.xml#L279) *([Experimental](Common.md#Experimental))* @@ -119,5 +119,5 @@ Expansion state of an entry in an [unnamed leveled hierarchy](#MultiLevelExpand) Property|Type|Description :-------|:---|:---------- -[Entry](Analytics.xml#L292)|\[String\]|An entry on a given [level](#MultiLevelExpandLevel) is identified by a collection of values for the `D` properties that constitute all levels up to and including the given one +[Entry](Analytics.xml#L292)|\[String\]|An entry on a given [level](#MultiLevelExpandLevel) is identified by a collection of values for the `DimensionProperties` that constitute all levels up to and including the given one [Levels](Analytics.xml#L295)|Int64?|Number of levels to be expanded, null means all levels, 0 means collapsed diff --git a/vocabularies/Analytics.xml b/vocabularies/Analytics.xml index cabce8ed..bdc75da1 100644 --- a/vocabularies/Analytics.xml +++ b/vocabularies/Analytics.xml @@ -197,9 +197,9 @@ $apply=filter(Industry in ('IT','AI')) /aggregate($count as LeavesCount), aggregate(Amount,Currency), Analytics.MultiLevelExpand( - Levels=[{"D":["Country"],"A":["CountryName"]}, - {"D":["Region"],"A":["RegionName"]}, - {"D":["Segment","Industry"],"A":[]}], + Levels=[{"DimensionProperties":["Country"],"AdditionalProperties":["CountryName"]}, + {"DimensionProperties":["Region"],"AdditionalProperties":["RegionName"]}, + {"DimensionProperties":["Segment","Industry"],"AdditionalProperties":[]}], Aggregation=["Amount","Currency"], SiblingOrder=[{"Property":"Amount","Descending":true}], ShowLevels=2, @@ -266,14 +266,14 @@ $apply=filter(Industry in ('IT','AI')) - Properties in `D` must be used to identify entries in [`ExpandEntries/Entry`](#MultiLevelExpandEntry), - otherwise they have the same effect as properties in `A`. + `DimensionProperties` must be used to identify entries in [`ExpandEntries/Entry`](#MultiLevelExpandEntry), + otherwise they have the same effect as `AdditionalProperties`. - + - - + + @@ -290,7 +290,7 @@ $apply=filter(Industry in ('IT','AI')) - +