Merge pull request #15 from srlearn/unique-variable-names

🐛 Append variable name to constant in `convert.jl`

Author: hayesall

src/convert.jl

@@ -35,7 +35,7 @@ function from_vector(X::Matrix{Int64}, y::Vector{Int64}, names::Union{Vector{Str
     if is_multiclass
 
         for (i, row) in enumerate(y)
-            push!(pos, "$(last(names))(id$(i),$(row)).")
+            push!(pos, "$(last(names))(id$(i),$(last(names))_$(row)).")
         end
 
     else
@@ -51,7 +51,7 @@ function from_vector(X::Matrix{Int64}, y::Vector{Int64}, names::Union{Vector{Str
 
     for (i, col) in enumerate(eachcol(X))
         var = names[i]
-        facts = vcat(facts, ["$(var)(id$(j),$(row))." for (j, row) in enumerate(col)])
+        facts = vcat(facts, ["$(var)(id$(j),$(var)_$(row))." for (j, row) in enumerate(col)])
     end
 
 
@@ -91,7 +91,7 @@ function from_vector(X::Matrix{Int64}, y::Vector{Float64}, names::Union{Vector{S
 
     for (i, col) in enumerate(eachcol(X))
         var = names[i]
-        facts = vcat(facts, ["$(var)(id$(j),$(row))." for (j, row) in enumerate(col)])
+        facts = vcat(facts, ["$(var)(id$(j),$(var)_$(row))." for (j, row) in enumerate(col)])
     end
 
     modes = ["$(name)(+id,#var$(name))." for name in names[1:end-1]]

test/test_convert.jl

@@ -15,15 +15,15 @@ using RelationalDatasets
             pos=["v4(id3)."],
             neg=["v4(id1).", "v4(id2)."],
             facts=[
-                "v1(id1,0).",
-                "v1(id2,1).",
-                "v1(id3,2).",
-                "v2(id1,1).",
-                "v2(id2,0).",
-                "v2(id3,2).",
-                "v3(id1,1).",
-                "v3(id2,2).",
-                "v3(id3,0).",
+                "v1(id1,v1_0).",
+                "v1(id2,v1_1).",
+                "v1(id3,v1_2).",
+                "v2(id1,v2_1).",
+                "v2(id2,v2_0).",
+                "v2(id3,v2_2).",
+                "v3(id1,v3_1).",
+                "v3(id2,v3_2).",
+                "v3(id3,v3_0).",
             ])),
         [
             "v1(+id,#varv1).",
@@ -44,15 +44,15 @@ using RelationalDatasets
         ],
         neg=[],
         facts=[
-            "v1(id1,0).",
-            "v1(id2,1).",
-            "v1(id3,2).",
-            "v2(id1,1).",
-            "v2(id2,0).",
-            "v2(id3,2).",
-            "v3(id1,1).",
-            "v3(id2,2).",
-            "v3(id3,0).",
+            "v1(id1,v1_0).",
+            "v1(id2,v1_1).",
+            "v1(id3,v1_2).",
+            "v2(id1,v2_1).",
+            "v2(id2,v2_0).",
+            "v2(id3,v2_2).",
+            "v3(id1,v3_1).",
+            "v3(id2,v3_2).",
+            "v3(id3,v3_0).",
         ])),
         [
             "v1(+id,#varv1).",
@@ -70,10 +70,10 @@ using RelationalDatasets
         pos=["c(id2)."],
         neg=["c(id1)."],
         facts=[
-            "a(id1,1).",
-            "a(id2,0).",
-            "b(id1,1).",
-            "b(id2,1).",
+            "a(id1,a_1).",
+            "a(id2,a_0).",
+            "b(id1,b_1).",
+            "b(id2,b_1).",
         ])),
         [
             "a(+id,#vara).",
@@ -90,10 +90,10 @@ using RelationalDatasets
         pos=["regressionExample(c(id1),0.5).", "regressionExample(c(id2),1.0)."],
         neg=[],
         facts=[
-            "a(id1,1).",
-            "a(id2,0).",
-            "b(id1,1).",
-            "b(id2,1).",
+            "a(id1,a_1).",
+            "a(id2,a_0).",
+            "b(id1,b_1).",
+            "b(id2,b_1).",
         ])),
         [
             "a(+id,#vara).",
@@ -106,18 +106,18 @@ using RelationalDatasets
         [0 1 1; 1 0 2; 2 2 0],
         [0, 1, 2],
     ) == (RelationalDatasets.RelationalDataset((
-            pos=["v4(id1,0).", "v4(id2,1).", "v4(id3,2)."],
+            pos=["v4(id1,v4_0).", "v4(id2,v4_1).", "v4(id3,v4_2)."],
             neg=[],
             facts=[
-                "v1(id1,0).",
-                "v1(id2,1).",
-                "v1(id3,2).",
-                "v2(id1,1).",
-                "v2(id2,0).",
-                "v2(id3,2).",
-                "v3(id1,1).",
-                "v3(id2,2).",
-                "v3(id3,0).",
+                "v1(id1,v1_0).",
+                "v1(id2,v1_1).",
+                "v1(id3,v1_2).",
+                "v2(id1,v2_1).",
+                "v2(id2,v2_0).",
+                "v2(id3,v2_2).",
+                "v3(id1,v3_1).",
+                "v3(id2,v3_2).",
+                "v3(id3,v3_0).",
             ])),
         [
             "v1(+id,#varv1).",