change main args, fix county data lines, add new test states, add ens…

…emble score distribution lines

rba/__main__.py

@@ -21,6 +21,7 @@
 
 import argparse
 import os
+import json
 
 import rba
 
@@ -50,7 +51,7 @@
     draw_parser.add_argument("--state", type=str, default="new_hampshire")
     draw_parser.add_argument("--output_file", type=str)
    #  draw_parser.add_argument("--graph_file", type=str, default=os.path.join(package_dir, "data/2010/new_hampshire_geodata_merged.json"))
-    draw_parser.add_argument("--edge_lifetime_file", type=str, default=None)
+    # draw_parser.add_argument("--edge_lifetime_file", type=str, default=None)
     draw_parser.add_argument("--num_frames", type=int, default=50)
     draw_parser.add_argument("--partition_file", type=str, default=None)
     draw_parser.set_defaults(func=rba.visualization.visualize)
@@ -84,20 +85,24 @@
     if args.func.__name__ == "create_communities":
         arguments["graph_file"] = os.path.join(package_dir, f"data/2010/{state}_geodata_merged.json")
         arguments["output_file"] = os.path.join(package_dir, f"data/2010/{state}_communities.json")
-    elif args.func.__name__ == "quantify_districtss":
+    elif args.func.__name__ == "quantify_districts":
         arguments["graph_file"] = os.path.join(package_dir, f"data/2010/{state}_geodata_merged.json")
         arguments["community_file"] = os.path.join(package_dir, f"data/2010/{state}_communities.json")
         arguments["district_file"] = os.path.join(package_dir, f"data/2010/{state}_districts.json")
     elif args.func.__name__ == "visualize":
         arguments["graph_file"] = os.path.join(package_dir, f"data/2010/{state}_geodata_merged.json")
+        arguments["edge_lifetime_file"] = os.path.join(package_dir, f"data/2010/{state}_communities.json")
     elif args.func.__name__ == "ensemble_analysis":
         arguments["graph_file"] = os.path.join(package_dir, f"data/2010/{state}_geodata_merged.json")
         arguments["community_file"] = os.path.join(package_dir, f"data/2010/{state}_communities.json")
         arguments["district_file"] = os.path.join(package_dir, f"data/2010/{state}_districts.json")
         arguments["vra_config_file"] = os.path.join(package_dir, f"data/2010/vra_{state}.json")
     elif args.func.__name__ == "optimize":
         arguments["graph_file"] = os.path.join(package_dir, f"data/2010/{state}_geodata_merged.json")
-        arguments["community_file"] = os.path.join(package_dir, f"data/2010/{state}_communities.json")
+        # with open(os.path.join(package_dir, f"data/2010/{state}_communities.json"), "r") as f:
+            # community_data = json.load(f)
+        arguments["communitygen_out_file"] = os.path.join(package_dir, f"data/2010/{state}_communities.json")
+        # arguments["communitygen_out_file"] = community_data
         arguments["vra_config_file"] = os.path.join(package_dir, f"data/2010/vra_{state}.json")
    #  if arguments["func"] 
    #  args.func(**{key: val for key, val in vars(args).items() if key != "func"})

rba/community_generation.py

@@ -9,6 +9,7 @@
 
 import networkx as nx
 import numpy as np
+import shapely
 from gerrychain import Graph
 from scipy.spatial import distance
 import matplotlib.pyplot as plt
@@ -36,7 +37,15 @@ def compute_precinct_similarities(graph, verbose=False):
         if data["total_pop"] == 0:
             population_density = 0
         else:
-            population_density = math.log(data["total_pop"]/data["ALAND10"])
+            # population_density = math.log(data["total_pop"]/data["ALAND10"])
+            # print(data["geometry"]["coordinates"])
+            if isinstance(data["geometry"]["coordinates"][0][0][0], float):
+                geometry = shapely.geometry.Polygon(data["geometry"]["coordinates"][0])
+            else:
+                geomlist = [shapely.geometry.Polygon(data["geometry"]["coordinates"][i][0]) for i in range(len(data["geometry"]["coordinates"]))]
+                geometry = shapely.ops.unary_union(geomlist)
+            # print(geometry.type)
+            population_density = math.log(data["total_pop"]/geometry.area)
         min_pop_density = min(min_pop_density, population_density)
         max_pop_density = max(max_pop_density, population_density)
         population_densities[node] = population_density