Skip to content

Multi-view support #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
domoritz wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Multi-view support #95

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
acc837f
added graphscape support and multi-view comparison, (not complete rul…
haldenl Feb 3, 2019
cdf2184
preliminary full graphscape
haldenl Feb 13, 2019
01d0da0
bug fix edits
haldenl Feb 13, 2019
d9c68b5
better multiview handling
haldenl Feb 13, 2019
23e349d
tweak weights
haldenl Feb 13, 2019
b169187
tweak weights
haldenl Feb 20, 2019
946c5e2
tune a little
haldenl Feb 28, 2019
27028ed
add support for topk results and topk draco, graphscape
haldenl Mar 13, 2019
3452c8a
add field ordering
haldenl Mar 13, 2019
d800969
update
haldenl Mar 15, 2019
e19c3cb
update weights
haldenl Mar 21, 2019
52f9275
prefer against zero bin
haldenl Mar 21, 2019
88c2986
fix asp2vl and modify weights
haldenl Mar 21, 2019
eb2e774
Add bin string hard constraint.
haldenl Aug 30, 2019
3390622
Add bin hard constraints.
haldenl Aug 30, 2019
57af58b
Modify weights.
haldenl Sep 9, 2019
8cf76b9
Tune weights.
haldenl Sep 11, 2019
b2ea8fd
Fix compare and define.
haldenl Sep 12, 2019
99755ec
Fix topk bug.
haldenl Sep 13, 2019
05284b9
Fixes.
haldenl Sep 16, 2019
86315a8
Fix stack output bug.
haldenl Sep 16, 2019
4fccf26
Fix bugs.
haldenl Sep 18, 2019
376e19c
visualization -> view.
haldenl Sep 18, 2019
00b5223
Fix optimization.
haldenl Sep 20, 2019
321adda
Fix weights.
haldenl Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
prefer against zero bin
  • Loading branch information
@haldenl
haldenl committed Mar 21, 2019
commit 52f9275faf243974a26a888d72868db323eee73f
1 change: 1 addition & 0 deletions asp/assign_weights.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ soft_weight(aggregate_group_by_raw,aggregate_group_by_raw_weight).
soft_weight(x_y_raw,x_y_raw_weight).
soft_weight(log,log_weight).
soft_weight(zero,zero_weight).
soft_weight(zero_bin,zero_bin_weight).
soft_weight(zero_size,zero_size_weight).
soft_weight(zero_positional,zero_positional_weight).
soft_weight(zero_skew,zero_skew_weight).
Expand Down
3 changes: 3 additions & 0 deletions asp/soft.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ soft(log,V,E) :- log(V,E).
% @constraint Prefer to include zero for continuous (binned doesn't need zero).
soft(zero,V,E) :- continuous(V,E), not zero(V,E).

% @constraint Prefer to exclude zero for binned.
soft(zero_bin,V,E) :- bin(V,E,_), zero(V,E).

% @constraint Prefer zero size (even when binned).
soft(zero_size,V) :- channel(V,E,size), not zero(V,E).

Expand Down
3 changes: 2 additions & 1 deletion asp/weights.lp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
#const aggregate_group_by_raw_weight = 10.
#const x_y_raw_weight = 1.
#const log_weight = 1.
#const zero_weight = 3.
#const zero_weight = 1.
#const zero_bin_weight = 1.
#const zero_size_weight = 3.
#const zero_positional_weight = 1.
#const zero_skew_weight = 5.
Expand Down