Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Molstar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michal Malý
Molstar
Commits
fe7e04f6
Commit
fe7e04f6
authored
5 years ago
by
Sebastian Bittrich
Browse files
Options
Downloads
Patches
Plain Diff
lowercase string parameters, filtering directive object
parent
1a14720e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/mol-io/writer/_spec/cif.spec.ts
+24
-8
24 additions, 8 deletions
src/mol-io/writer/_spec/cif.spec.ts
src/mol-io/writer/cif/encoder.ts
+22
-1
22 additions, 1 deletion
src/mol-io/writer/cif/encoder.ts
with
46 additions
and
9 deletions
src/mol-io/writer/_spec/cif.spec.ts
+
24
−
8
View file @
fe7e04f6
...
...
@@ -78,18 +78,34 @@ const filter_aware_encoder1 = CifWriter.createEncoder({
binary
:
true
,
binaryAutoClassifyEncoding
:
true
});
filter_aware_encoder1
.
setFilter
(
C
.
Category
.
whitelistBlacklistFilter
([
'
atom_site
'
],
// allow only category atom_site
[],
// blacklist no categories
[
'
atom_site.Cartn_x
'
,
'
atom_site.Cartn_y
'
],
// for atom_site: allow only Cartn_x and Cartn_y
[]));
// blacklist no fields
filter_aware_encoder1
.
setFilter
(
C
.
Category
.
filterOf
([
{
// allow only category atom_site
categoryName
:
'
atom_site
'
,
behavior
:
'
whitelist
'
},
{
// for atom_site: allow only Cartn_x and Cartn_y
categoryName
:
'
atom_site
'
,
columnName
:
'
Cartn_x
'
,
behavior
:
'
whitelist
'
},
{
categoryName
:
'
atom_site
'
,
columnName
:
'
Cartn_y
'
,
behavior
:
'
whitelist
'
}
]));
const
filter_aware_encoder2
=
CifWriter
.
createEncoder
({
binary
:
true
});
filter_aware_encoder2
.
setFilter
(
C
.
Category
.
whitelistBlacklistFilter
([],
[
'
atom_site
'
],
// ignore atom_site category
[],
[
'
other_fields.field2
'
]));
// exclude field2
filter_aware_encoder2
.
setFilter
(
C
.
Category
.
filterOf
([
{
// ignore atom_site category
categoryName
:
'
atom_site
'
,
behavior
:
'
blacklist
'
},
{
// exclude field2
categoryName
:
'
other_fields
'
,
columnName
:
'
field2
'
,
behavior
:
'
blacklist
'
}
]));
describe
(
'
filtering-config
'
,
()
=>
{
const
decoded1
=
process
(
filter_aware_encoder1
);
...
...
This diff is collapsed.
Click to expand it.
src/mol-io/writer/cif/encoder.ts
+
22
−
1
View file @
fe7e04f6
...
...
@@ -132,7 +132,28 @@ export namespace Category {
includeField
(
categoryName
:
string
,
fieldName
:
string
):
boolean
,
}
export
function
whitelistBlacklistFilter
(
cat_whitelist
:
String
[],
cat_blacklist
:
String
[],
field_whitelist
:
String
[],
field_blacklist
:
String
[]):
Filter
{
export
interface
FilteringDirective
{
categoryName
:
string
,
columnName
?:
string
,
behavior
:
FilteringBehavior
}
export
type
FilteringBehavior
=
'
whitelist
'
|
'
blacklist
'
;
export
function
filterOf
(
directives
:
FilteringDirective
[]):
Filter
{
const
cat_whitelist
:
string
[]
=
[];
const
cat_blacklist
:
string
[]
=
[];
const
field_whitelist
:
string
[]
=
[];
const
field_blacklist
:
string
[]
=
[];
for
(
const
d
of
directives
)
{
const
field
=
d
.
columnName
;
const
name
=
field
?
d
.
categoryName
+
'
.
'
+
d
.
columnName
:
d
.
categoryName
;
const
list
=
d
.
behavior
===
'
whitelist
'
?
(
field
?
field_whitelist
:
cat_whitelist
)
:
(
field
?
field_blacklist
:
cat_blacklist
);
list
[
list
.
length
]
=
name
;
}
const
wlcatcol
=
field_whitelist
.
map
(
it
=>
it
.
split
(
'
.
'
)[
0
]);
// blacklist has higher priority
return
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment