synth data still unfixed

grahamstark · Aug 29, 2024 · 9d829cb · 9d829cb
1 parent f5e8e79
commit 9d829cb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/scripts/fixup_synth_data_v2.jl b/scripts/fixup_synth_data_v2.jl
@@ -298,15 +298,20 @@ function assign_child_relationships!(pers :: Vector{MiniPers}, stats::NamedTuple
             parent.relationships[cn] = relationship_to_parent
         end
     end
+    pretty_table( rel_matrix(pers) )
+
     for cn in children
         child = pers[cn]
         for pn in parents
             parent = pers[pn]
             for r in 1:n
-                child.relationships[r] = 
-                    one_generation_relationship( ; 
-                        relationship_to_parent = parent.relationships[cn],
-                        parents_relationship_to_person = parent.relationships[r])
+                println( "r=$r pn=$pn")
+                if r != pn
+                    child.relationships[r] = 
+                        one_generation_relationship( ; 
+                            relationship_to_parent = reciprocal_relationship(parent.relationships[pn]),
+                            parents_relationship_to_person = parent.relationships[r])
+                end
             end
         end
         # non 1st bu people. Nearest they can be is sibling, then othen

diff --git a/src/Definitions.jl b/src/Definitions.jl
@@ -1530,6 +1530,7 @@ function one_generation_relationship( ;
    relationship_to_parent :: Relationship,
    parents_relationship_to_person :: Relationship ) :: Relationship
    @argcheck relationship_to_parent in [
+      # This_Person,
       Foster_child,
       Step_son_or_daughter,
       Son_or_daughter_incl_adopted,