Project category value columns in compiler

HazyResearch · Jun 11, 2016 · a544cd9 · a544cd9
1 parent 94e2013
commit a544cd9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/main/scala/org/deepdive/ddlog/DeepDiveLogCompiler.scala b/src/main/scala/org/deepdive/ddlog/DeepDiveLogCompiler.scala
@@ -485,6 +485,12 @@ class QueryCompiler(cq : ConjunctiveQuery) {
             case term => s"""R${headAsBody indexOf x}.${term
             } AS "${x.name}.R${headAsBody indexOf x}.${term}\""""
           }) get
+        ) ::: (
+          // project category columns (to pass linking b/w category vals and weights)
+          schemaDeclarationByRelationName get x.name map (_.categoricalColumns map {
+            case term => s"""R${headAsBody indexOf x}.${term
+            } AS "${x.name}.R${headAsBody indexOf x}.${term}\""""
+          }) get
         )
       case _ => List.empty
     }

diff --git a/test/expected-output-test/chunking_example/compile.expected b/test/expected-output-test/chunking_example/compile.expected
@@ -83,6 +83,7 @@ input_query: """
 SELECT R0.dd_id AS "chunk.R0.dd_id"
      , R0.sent_id AS "chunk.R0.sent_id"
      , R0.word_id AS "chunk.R0.word_id"
+     , R0.tag AS "chunk.R0.tag"
      , R3.feature AS "dd_weight_column_0"
      , R0.tag AS "dd_weight_column_1"
 FROM dd_variables_chunk R0
@@ -111,9 +112,11 @@ input_query: """
 SELECT R0.dd_id AS "chunk.R0.dd_id"
      , R0.sent_id AS "chunk.R0.sent_id"
      , R0.word_id AS "chunk.R0.word_id"
+     , R0.tag AS "chunk.R0.tag"
      , R1.dd_id AS "chunk.R1.dd_id"
      , R1.sent_id AS "chunk.R1.sent_id"
      , R1.word_id AS "chunk.R1.word_id"
+     , R1.tag AS "chunk.R1.tag"
      , R0.tag AS "dd_weight_column_0"
      , R1.tag AS "dd_weight_column_1"
 FROM dd_variables_chunk R0
@@ -146,9 +149,11 @@ input_query: """
 SELECT R0.dd_id AS "chunk.R0.dd_id"
      , R0.sent_id AS "chunk.R0.sent_id"
      , R0.word_id AS "chunk.R0.word_id"
+     , R0.tag AS "chunk.R0.tag"
      , R1.dd_id AS "chunk.R1.dd_id"
      , R1.sent_id AS "chunk.R1.sent_id"
      , R1.word_id AS "chunk.R1.word_id"
+     , R1.tag AS "chunk.R1.tag"
      , R0.tag AS "dd_weight_column_0"
      , R1.tag AS "dd_weight_column_1"
 FROM dd_variables_chunk R0