From 70cc7ace550d2e7d71cb175dc3a0d1582488a2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Robotka?= <robotka.adrian@gmail.com>
Date: Thu, 22 Apr 2021 08:10:03 +0200
Subject: [PATCH] rename to er-graph
---
.gitignore | 4 ++
moder/build.gradle.kts => build.gradle.kts | 0
moder/gradle.properties => gradle.properties | 0
moder/gradlew => gradlew | 0
moder/gradlew.bat => gradlew.bat | 0
grakn/.gitignore | 1 -
grakn/big-bang.sh | 24 -------
grakn/console.sh | 8 ---
grakn/data/data.gql | 0
grakn/data/schema.gql | 67 -------------------
grakn/docker-compose.yml | 12 ----
moder/.gitignore | 4 --
moder/settings.gradle.kts | 3 -
settings.gradle.kts | 2 +
.../main/kotlin/core/relation/SameAs.kt | 0
.../kotlin/core/relation/physical/Connects.kt | 0
.../kotlin/core/relation/physical/Consists.kt | 0
.../core/relation/physical/connectionTypes.kt | 0
.../kotlin/core/schema/ComposableEntity.kt | 0
.../main/kotlin/core/schema/Entity.kt | 0
.../main/kotlin/core/schema/Graph.kt | 8 +--
.../main/kotlin/core/schema/Label.kt | 0
.../main/kotlin/core/schema/Relation.kt | 0
.../main/kotlin/core/schema/typesStrings.kt | 0
.../main/kotlin/core/util/Serial.kt | 0
{moder/src => src}/main/kotlin/main.kt | 0
.../entity/electrical/ElectricalStuff.kt | 0
.../model/entity/network/NetzwerkStuff.kt | 0
.../kotlin/model/electrical/BasicCreations.kt | 0
.../kotlin/model/electrical/MiniGraphTests.kt | 0
30 files changed, 9 insertions(+), 124 deletions(-)
create mode 100644 .gitignore
rename moder/build.gradle.kts => build.gradle.kts (100%)
rename moder/gradle.properties => gradle.properties (100%)
rename moder/gradlew => gradlew (100%)
rename moder/gradlew.bat => gradlew.bat (100%)
delete mode 100644 grakn/.gitignore
delete mode 100755 grakn/big-bang.sh
delete mode 100755 grakn/console.sh
delete mode 100644 grakn/data/data.gql
delete mode 100644 grakn/data/schema.gql
delete mode 100644 grakn/docker-compose.yml
delete mode 100644 moder/.gitignore
delete mode 100644 moder/settings.gradle.kts
create mode 100644 settings.gradle.kts
rename {moder/src => src}/main/kotlin/core/relation/SameAs.kt (100%)
rename {moder/src => src}/main/kotlin/core/relation/physical/Connects.kt (100%)
rename {moder/src => src}/main/kotlin/core/relation/physical/Consists.kt (100%)
rename {moder/src => src}/main/kotlin/core/relation/physical/connectionTypes.kt (100%)
rename {moder/src => src}/main/kotlin/core/schema/ComposableEntity.kt (100%)
rename {moder/src => src}/main/kotlin/core/schema/Entity.kt (100%)
rename {moder/src => src}/main/kotlin/core/schema/Graph.kt (86%)
rename {moder/src => src}/main/kotlin/core/schema/Label.kt (100%)
rename {moder/src => src}/main/kotlin/core/schema/Relation.kt (100%)
rename {moder/src => src}/main/kotlin/core/schema/typesStrings.kt (100%)
rename {moder/src => src}/main/kotlin/core/util/Serial.kt (100%)
rename {moder/src => src}/main/kotlin/main.kt (100%)
rename {moder/src => src}/main/kotlin/model/entity/electrical/ElectricalStuff.kt (100%)
rename {moder/src => src}/main/kotlin/model/entity/network/NetzwerkStuff.kt (100%)
rename {moder/src => src}/test/kotlin/model/electrical/BasicCreations.kt (100%)
rename {moder/src => src}/test/kotlin/model/electrical/MiniGraphTests.kt (100%)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d5419b8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.idea/
+.gradle/
+build/
+gradle/
diff --git a/moder/build.gradle.kts b/build.gradle.kts
similarity index 100%
rename from moder/build.gradle.kts
rename to build.gradle.kts
diff --git a/moder/gradle.properties b/gradle.properties
similarity index 100%
rename from moder/gradle.properties
rename to gradle.properties
diff --git a/moder/gradlew b/gradlew
similarity index 100%
rename from moder/gradlew
rename to gradlew
diff --git a/moder/gradlew.bat b/gradlew.bat
similarity index 100%
rename from moder/gradlew.bat
rename to gradlew.bat
diff --git a/grakn/.gitignore b/grakn/.gitignore
deleted file mode 100644
index 19e0180..0000000
--- a/grakn/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-db/
diff --git a/grakn/big-bang.sh b/grakn/big-bang.sh
deleted file mode 100755
index ea51cf0..0000000
--- a/grakn/big-bang.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-docker_cmd=docker
-# use podman if possible
-command -v podman >/dev/null 2>&1 && docker_cmd=podman
-
-console() {
- $docker_cmd exec -i grakn-srv \
- /grakn-core-all-linux/grakn console $*
-}
-
-db() {
- console --keyspace sch $*
-}
-
-wipe() {
- echo 'keyspace delete sch' | console
-}
-
-###
-
-wipe
-db --file /data/schema.gql
-#db --file /data/data.gql
diff --git a/grakn/console.sh b/grakn/console.sh
deleted file mode 100755
index c72c4c7..0000000
--- a/grakn/console.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-docker_cmd=docker
-# use podman if possible
-command -v podman >/dev/null 2>&1 && docker_cmd=podman
-
-$docker_cmd exec -it grakn-srv \
- /grakn-core-all-linux/grakn console $*
diff --git a/grakn/data/data.gql b/grakn/data/data.gql
deleted file mode 100644
index e69de29..0000000
diff --git a/grakn/data/schema.gql b/grakn/data/schema.gql
deleted file mode 100644
index f1aaf39..0000000
--- a/grakn/data/schema.gql
+++ /dev/null
@@ -1,67 +0,0 @@
-define
-
-################
-## Attributes ##
-################
- label sub attribute,
- value string;
-
- annotation sub attribute,
- value string;
-
- identifier sub label;
- name sub label;
- nick sub label;
-
- #fqdn sub label;
- #ip sub label;
-
- operating-system sub annotation,
- regex "^(linux|ios|windows)$";
- number sub annotation;
- color sub annotation;
- cableLabel sub annotation;
-
-################
-## Entities ##
-################
-
- abstractInfraItem sub entity, abstract,
- key identifier,
- has name,
- plays container,
- plays containee;
-
- node sub abstractInfraItem,
- has nick,
- has operating-system;
-
- port sub abstractInfraItem,
- has number;
-
- # TODO check out https://docs.grakn.ai/docs/schema/concepts#define-a-relation-to-play-a-role
- cable sub abstractInfraItem,
- has color,
- has cableLabel;
-
-################
-## Realtions ##
-################
-
- containment sub relation,
- relates container,
- relates containee;
-
- hasPort sub containment;
-
-################
-## Rules ##
-################
-
-nodes-has-ports sub rule,
-when {
- $a isa node;
- $b isa port;
-}, then {
- (container: $a, containee: $b) isa hasPort;
-};
diff --git a/grakn/docker-compose.yml b/grakn/docker-compose.yml
deleted file mode 100644
index e9dc5a4..0000000
--- a/grakn/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "3.4"
-services:
-
- grakn:
- container_name: grakn-srv
- image: graknlabs/grakn:1.8.4
- volumes:
- - ./:/app
- - ./data:/data
- - ./db:/grakn-core-all-linux/server/db/
- ports:
- - 127.0.0.1:48555:48555
diff --git a/moder/.gitignore b/moder/.gitignore
deleted file mode 100644
index f3d7823..0000000
--- a/moder/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.*
-!.git*
-build/
-gradle/
diff --git a/moder/settings.gradle.kts b/moder/settings.gradle.kts
deleted file mode 100644
index aaf6edf..0000000
--- a/moder/settings.gradle.kts
+++ /dev/null
@@ -1,3 +0,0 @@
-
-rootProject.name = "moder"
-
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..18d172a
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "er-graph"
+
diff --git a/moder/src/main/kotlin/core/relation/SameAs.kt b/src/main/kotlin/core/relation/SameAs.kt
similarity index 100%
rename from moder/src/main/kotlin/core/relation/SameAs.kt
rename to src/main/kotlin/core/relation/SameAs.kt
diff --git a/moder/src/main/kotlin/core/relation/physical/Connects.kt b/src/main/kotlin/core/relation/physical/Connects.kt
similarity index 100%
rename from moder/src/main/kotlin/core/relation/physical/Connects.kt
rename to src/main/kotlin/core/relation/physical/Connects.kt
diff --git a/moder/src/main/kotlin/core/relation/physical/Consists.kt b/src/main/kotlin/core/relation/physical/Consists.kt
similarity index 100%
rename from moder/src/main/kotlin/core/relation/physical/Consists.kt
rename to src/main/kotlin/core/relation/physical/Consists.kt
diff --git a/moder/src/main/kotlin/core/relation/physical/connectionTypes.kt b/src/main/kotlin/core/relation/physical/connectionTypes.kt
similarity index 100%
rename from moder/src/main/kotlin/core/relation/physical/connectionTypes.kt
rename to src/main/kotlin/core/relation/physical/connectionTypes.kt
diff --git a/moder/src/main/kotlin/core/schema/ComposableEntity.kt b/src/main/kotlin/core/schema/ComposableEntity.kt
similarity index 100%
rename from moder/src/main/kotlin/core/schema/ComposableEntity.kt
rename to src/main/kotlin/core/schema/ComposableEntity.kt
diff --git a/moder/src/main/kotlin/core/schema/Entity.kt b/src/main/kotlin/core/schema/Entity.kt
similarity index 100%
rename from moder/src/main/kotlin/core/schema/Entity.kt
rename to src/main/kotlin/core/schema/Entity.kt
diff --git a/moder/src/main/kotlin/core/schema/Graph.kt b/src/main/kotlin/core/schema/Graph.kt
similarity index 86%
rename from moder/src/main/kotlin/core/schema/Graph.kt
rename to src/main/kotlin/core/schema/Graph.kt
index c8cc71d..d971e7f 100644
--- a/moder/src/main/kotlin/core/schema/Graph.kt
+++ b/src/main/kotlin/core/schema/Graph.kt
@@ -17,13 +17,11 @@ fun Entity.traverse(
terminals: Set<KClass<out Entity>>
): Set<Entity> {
// TODO exception on loop
- val visited = mutableSetOf<Entity>() // to prevent loop
- val output = mutableSetOf<Entity>()
- val queue = mutableListOf(this) // to visit still
+ val visited = mutableSetOf<Entity>() // prevents loop
+ val queue = mutableListOf(this)
while (queue.isNotEmpty()) {
val entityIter = queue.removeLast()
visited.add(entityIter)
- output.add(entityIter)
if (terminals.terminatesIn(entityIter))
continue
@@ -34,7 +32,7 @@ fun Entity.traverse(
relatives.filter { !visited.contains(it) }
)
}
- return output
+ return visited
}
private fun Entity.allowedRelatives(allowedPath: Set<KClass<out Relation>>): Map<Relation, Entity> =
diff --git a/moder/src/main/kotlin/core/schema/Label.kt b/src/main/kotlin/core/schema/Label.kt
similarity index 100%
rename from moder/src/main/kotlin/core/schema/Label.kt
rename to src/main/kotlin/core/schema/Label.kt
diff --git a/moder/src/main/kotlin/core/schema/Relation.kt b/src/main/kotlin/core/schema/Relation.kt
similarity index 100%
rename from moder/src/main/kotlin/core/schema/Relation.kt
rename to src/main/kotlin/core/schema/Relation.kt
diff --git a/moder/src/main/kotlin/core/schema/typesStrings.kt b/src/main/kotlin/core/schema/typesStrings.kt
similarity index 100%
rename from moder/src/main/kotlin/core/schema/typesStrings.kt
rename to src/main/kotlin/core/schema/typesStrings.kt
diff --git a/moder/src/main/kotlin/core/util/Serial.kt b/src/main/kotlin/core/util/Serial.kt
similarity index 100%
rename from moder/src/main/kotlin/core/util/Serial.kt
rename to src/main/kotlin/core/util/Serial.kt
diff --git a/moder/src/main/kotlin/main.kt b/src/main/kotlin/main.kt
similarity index 100%
rename from moder/src/main/kotlin/main.kt
rename to src/main/kotlin/main.kt
diff --git a/moder/src/main/kotlin/model/entity/electrical/ElectricalStuff.kt b/src/main/kotlin/model/entity/electrical/ElectricalStuff.kt
similarity index 100%
rename from moder/src/main/kotlin/model/entity/electrical/ElectricalStuff.kt
rename to src/main/kotlin/model/entity/electrical/ElectricalStuff.kt
diff --git a/moder/src/main/kotlin/model/entity/network/NetzwerkStuff.kt b/src/main/kotlin/model/entity/network/NetzwerkStuff.kt
similarity index 100%
rename from moder/src/main/kotlin/model/entity/network/NetzwerkStuff.kt
rename to src/main/kotlin/model/entity/network/NetzwerkStuff.kt
diff --git a/moder/src/test/kotlin/model/electrical/BasicCreations.kt b/src/test/kotlin/model/electrical/BasicCreations.kt
similarity index 100%
rename from moder/src/test/kotlin/model/electrical/BasicCreations.kt
rename to src/test/kotlin/model/electrical/BasicCreations.kt
diff --git a/moder/src/test/kotlin/model/electrical/MiniGraphTests.kt b/src/test/kotlin/model/electrical/MiniGraphTests.kt
similarity index 100%
rename from moder/src/test/kotlin/model/electrical/MiniGraphTests.kt
rename to src/test/kotlin/model/electrical/MiniGraphTests.kt
--
GitLab