Przeglądaj źródła

Auto layout

master
Pete Shadbolt 8 lat temu
rodzic
commit
96e6678393
8 zmienionych plików z 97 dodań i 48 usunięć
  1. +48
    -0
      abp/fancy.py
  2. +5
    -42
      abp/graphstate.py
  3. +1
    -1
      examples/lattice_demo.py
  4. +2
    -2
      examples/local_complementation.py
  5. +6
    -0
      examples/mix_graph_and_networkx.py
  6. +33
    -0
      server/server.py
  7. +1
    -2
      static/scripts/tables.js
  8. +1
    -1
      tests/test_local_complementation.py

+ 48
- 0
abp/fancy.py Wyświetl plik

@@ -0,0 +1,48 @@
import time, atexit, json
import networkx
import numpy as np
import websocket
from socket import error as socket_error
import graphstate
import util

class GraphState(graphstate.GraphState, networkx.Graph):
def __init__(self, *args, **kwargs):
graphstate.GraphState.__init__(self, *args, **kwargs)
self.connect_to_server()

def connect_to_server(self, uri = "ws://localhost:5000"):
""" Attempt to connect to the websocket server """
try:
self.ws = websocket.create_connection(uri)
atexit.register(self.shutdown)
except socket_error:
self.ws = None

def shutdown(self):
""" Close the connection to the websocket """
self.update()
self.ws.close()

def update(self, delay = 0.5):
""" Call this function when you are ready to send data to the browser """
if not self.ws:
return

# Automatically perform layout if position is not provided
if not all(("position" in node) for node in self.node.values()):
self.layout()

# Send data to browser and rate-limit
self.ws.send(json.dumps(self.to_json()))
time.sleep(delay)

def layout(self, dim=3):
""" Automatically lay out the graph """
pos = networkx.spring_layout(self, dim, scale=np.sqrt(self.order()))
middle = np.average(pos.values(), axis=0)
pos = {key: value - middle for key, value in pos.items()}
for key, (x, y, z) in pos.items():
self.node[key]["position"] = util.xyz(x, y, z)


+ 5
- 42
abp/graphstate.py Wyświetl plik

@@ -3,27 +3,14 @@ Provides an extremely basic graph structure, based on neighbour lists
"""

import itertools as it
import clifford
import json
import qi
try:
from networkx import Graph as NXGraph
except ImportError:
NXGraph = object
try:
import websocket
from socket import error as socket_error
import time, atexit
except ImportError:
websocket = None

class GraphState(NXGraph):

def __init__(self, nodes=[], connect_to_server=True):
import qi, clifford, util

class GraphState(object):

def __init__(self, nodes=[]):
self.adj, self.node = {}, {}
self.add_nodes(nodes)
if connect_to_server:
self.connect_to_server()

def add_node(self, v, **kwargs):
""" Add a node """
@@ -206,27 +193,3 @@ class GraphState(NXGraph):
""" Check equality between graphs """
return self.adj == other.adj and self.node == other.node

def connect_to_server(self, uri = "ws://localhost:5000"):
""" Attempt to connect to the websocket server """
if not websocket:
return
try:
self.ws = websocket.create_connection(uri)
atexit.register(self.shutdown)
except socket_error:
#print "Could not establish connection to server ({}).".format(uri)
self.ws = None


def shutdown(self):
""" Close the connection to the websocket """
self.update()
self.ws.close()

def update(self, delay = 0.5):
""" Call this function when you are ready to send data to the browser """
if not self.ws:
return
data = json.dumps(self.to_json())
self.ws.send(data)
time.sleep(delay)

+ 1
- 1
examples/lattice_demo.py Wyświetl plik

@@ -1,4 +1,4 @@
from abp.graphstate import GraphState
from abp.fancy import GraphState
from abp.util import xyz
import numpy as np
import time


+ 2
- 2
examples/local_complementation.py Wyświetl plik

@@ -1,8 +1,8 @@
from abp.viz import VisibleGraphState
from abp.fancy import GraphState
from abp.util import xyz
from abp.clifford import *

psi = VisibleGraphState()
psi = GraphState()
psi.add_node(0, position = xyz(0, 0))
psi.add_node(1, position = xyz(1, 1))
psi.add_node(2, position = xyz(3, 2))


+ 6
- 0
examples/mix_graph_and_networkx.py Wyświetl plik

@@ -0,0 +1,6 @@
from abp.fancy import GraphState

g = GraphState()
n = 10
g.add_nodes_from(range(n))
g.add_edges_from([i, i+1] for i in range(n-1))

+ 33
- 0
server/server.py Wyświetl plik

@@ -0,0 +1,33 @@
from websocket_server import WebsocketServer
import threading
import abp
import json

clients = []

def new_message(client, server, message):
decoded_message = json.loads(message)
if "diff" in decoded_message:
server.send_message_to_all(message)
elif "method" in decoded_message:
message = compute_diff(decoded_message)
server.send_message_to_all(message)
else:
print "Could not interpret message"


def new_client(client, server):
print "Client {} connected.".format(client["id"])
clients.append(client)

def client_left(client, server):
print "Client {} disconnected.".format(client["id"])
clients.remove(client)

if __name__ == '__main__':
server = WebsocketServer(5001)
server.set_fn_new_client(new_client)
server.set_fn_message_received(new_message)
server.set_fn_client_left(client_left)
server.run_forever()


+ 1
- 2
static/scripts/tables.js
Plik diff jest za duży
Wyświetl plik


+ 1
- 1
tests/test_local_complementation.py Wyświetl plik

@@ -1,4 +1,4 @@
from abp import GraphState
from abp.fancy import GraphState
from abp import qi

def test_local_comp():


Ładowanie…
Anuluj
Zapisz