diff --git a/uml2es/README.md b/uml2es/README.md index 68df2cd..f96396d 100644 --- a/uml2es/README.md +++ b/uml2es/README.md @@ -8,11 +8,11 @@ UML2ES is a toolkit to support modeling MarkLogic data in UML and mapping that U - - -Also watch the following video: +Also watch the following video (it's a little out of date): - -It works like this: +UML2ES works like this: ![toolkit](toolkit.png) @@ -24,7 +24,7 @@ The toolkit consists of the following parts: - [umlProfile](umlProfile): A UML profile containing stereotypes for MarkLogic Entity Services. Use this profile to include Entity Services configuration to your UML model. - [excel](excel): You can build your model in Excel as an alternative to UML! Maybe we should rename this toolkit *Excel2ES*! The toolkit provides an [Excel template](excel/uml2es-excel-template.xlsx) for this purpose. See [examples/hrexcel](examples/hrexcel) for a detailed example of how to use it. Also included is a [mapping spreadsheet](excel.uml2es-excel-mapping-template.xlsx). See [tutorials/employeeCradleToGrave.md](tutorials/employeeCradleToGrave.md) and [examples/hr](examples/hr) for detailed examples of how to use it. - [tutorials](tutorial): Step-by-step tutorials on how to use UML2ES ranging from simple -- [tutorials/papyrus_model_edit.md](tutorials/papyrus_model_edit.md) -- to epic: [tutorials/employeeCradleToGrave.md](tutorials/employeeCradleToGrave.md). -- [examples](examples): Numerous examples showing the use of UML (and Excel) data models for MarkLogic. Highlights: modeling for Entity Services and Template-Driven Extraction; modeling complex document relationships using UML relationships; the UML toolkit and Data Hub; the Data Hub "cookie cutter"; mixed models (documents + semantics); logical vs. physical; generating MarkLogic code from the UML model; using ml-gradle to run the transformation of UML to Entity Services as part of your build. +- [examples](examples): Numerous examples showing the use of UML (and Excel) data models for MarkLogic and its Data Hub framework. ## How We Expect You Will Use This Toolkit As a user, you want to design a data model using UML and then ingest data into MarkLogic that conforms to this model. Put differently, you plan to put significant data into MarkLogic and want to ensure that the structure of this data follows a well considered model. @@ -39,7 +39,7 @@ If that's you, we think this toolkit is for you. You will need the following ing ## Where To Begin Start with the [tutorials](tutorials). If want to build a really simple model and see it through to MarkLogic, try [tutorials/papyrus_model_edit.md](tutorials/papyrus_model_edit.md) or [tutorials/magicdraw_model_edit.md](tutorials/magicdraw_model_edit.md). If you want to have more fun and explore how a team would deliver a more interesting model, try [tutorials/employeeCradleToGrave.md](tutorials/employeeCradleToGrave.md). -Then dive into the [examples](examples). The [movies example](examples/movies) is a good place to start. If you are planning to use MarkLogic's data hub framework, or if you are interested in semantics, begin with the [hr example](examples/hr). +Then dive into the [examples](examples). The [movies example](examples/movies) is a good place to start if you want to explore how MarkLogic represents UML classes and relationships. If you are planning to use MarkLogic's data hub framework, or if you are interested in semantics, begin with the [hrHub5 example](examples/hrHub5). ## Going Deeper Once you get deeper into the toolkit, refer to the [docs](docs/README.md) to learn about: the profile and its stereotypes; how the transform maps UML to Entity Services; how the toolkit supports semantics; how to include the transform in your build process. diff --git a/uml2es/docs/build.md b/uml2es/docs/build.md index 9aa9665..25b738a 100644 --- a/uml2es/docs/build.md +++ b/uml2es/docs/build.md @@ -3,7 +3,13 @@ The toolkit supports a gradle build process. Gradle is the most widely used build tool for MarkLogic implementations. The toolkit includes common gradle tasks to deploy your UML model and generate harmonization/conversion code from it. You use these tasks, as well as common [ml-gradle](https://github.com/marklogic-community/ml-gradle/wiki) and [data hub](https://marklogic.github.io/marklogic-data-hub/refs/gradle-tasks/) tasks, to deploy your application. -The toolkit provides a gradle build file containing all model deployment and code generation tasks: [../uml2esTransform/uml2es.gradle](../uml2esTransform/uml2es.gradle). Actually, it also includes a similar build file for use for DHF: [../uml2esTransform/uml2es4dhf.gradle](../uml2esTransform/uml2es4dhf.gradle). Here is a summary of the tasks from that build file: +The toolkit provides a gradle build file containing all model deployment and code generation tasks. Actually, it provides three versions of this build file: + +- One for DHF 5.x applications [../uml2esTransform/uml2es4dhf5.gradle](../uml2esTransform/uml2es4dhf5.gradle) +- One for DHF 4.1 applications [../uml2esTransform/uml2es4dhf4.gradle](../uml2esTransform/uml2es4dhf4.gradle) +- One for vanilla, non-DHF, applications [../uml2esTransform/uml2es.gradle](../uml2esTransform/uml2es.gradle) + +Here is a summary of the tasks from that build file: ## Build Tasks @@ -11,158 +17,65 @@ The toolkit provides a gradle build file containing all model deployment and cod *Purpose*: Load your UML model into MarkLogic and convert it to ES. -*DHF/Vanilla*: Both +*Architectures* : Vanilla, DHF 4.1, DHF 5.x *Input:* -- modelName (XMI or Excel filename without suffix) -- lax: true/false. Default: false (Use lax mode when transforming from UML to ES.) +- modelFile: Full or relative path to your UML/XMI or Excel filename +- lax: true/false. Default: false. (Use lax=true if model is missing attribute types or has other missing info.) *Dependencies:* -- Your gradle project has the folder data/model -- Your model is in that folder -- Your model is XMI -- Your model ends in .xml - Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... -- Standard DHF environment properties: mlHost, mlFinalPort +- Standard DHF environment properties: mlHost, mlFinalPort. ... +- UML2ES transform deployed to your modules database *Effects:* -- Target database has the UML model, the ES model, the ES extensions, findings, generated code -- Target database has the ES model and its extended triples deployed +- Target database has the original UML model and the outputs of transforming it to ES: the ES model, the ES extensions, findings, some generated code - Your gradle project has entity-services, entity-services-dump, entity-services-extension folders -- You will see generated code in src/main/ml-config, src/main/ml-modules, src/main/ml-schemas +- Vanilla architecture: The model is fully deployed, meaning MarkLogic is aware of the model and allows you to introspect the model using semantic queries. If you want to generate code/artifacts from it, run built-in non-UML2ES gradle task mlGenerateModelArtifacts +- In the DHF architecture, the model is "deployed" in the loose sense it can be semantically introspected. But in DHF no entities have yet been created. ### uCreateDHFEntities -*Purpose*: Create DHF plugin entities based on classes in your model. +*Purpose*: Create DHF entities based on classes in your model. + +*Architectures* : DHF 4.1, DHF 5.x *DHF/Vanilla*: DHF *Input:* -- modelName - name of UML module file without .xml suffix -- entities (optional) - CSV of class names representing entities to create -- entitySelect (optional) - Possible values: - * "infer" - Have the cookie cutter infer which classes are entities. Ignore entities specified. (This works well for tree-based models where the candidate classes are parents but not children, such as [../examples/hr](../examples/hr). It does not always work. For example, in the graph-like model [../examples/movies](../examples/movies), the Movie class cannot be inferred to be *entity worthy*. - * "all" - All classes are considered entities. Ignore entities specified. +- modelFile: Full or relative path to your UML/XMI or Excel filename +- entitySelect (optional) - Instructions on which classes in the model should become DHF entities. Possible values: + * "infer" - Infer which classes are entities. Ignore entities specified. (This works well for tree-based models where the candidate classes are parents but not children, such as [../examples/hr](../examples/hr). It does not always work. For example, in the graph-like model [../examples/movies](../examples/movies), the Movie class cannot be inferred to be *entity worthy*. + * "all" - All classes are considered entities. + * "stereotyped" - Classes stereotyped xDHFEntity are considered entities. +- entities (optional) - A list of class names (comma-separated) representing entities to create. Use this if you want to specify your own list of entities and none of the entitySelect options works for you. *Dependencies:* -- Your gradle project is DHF 4.1. If you prefer to use a more recent DHF 4.x release, make sure to change the DHF version in any *.gradle or gradle*.properties files you obtain from this toolkit. -- You have deployed your UML model -- Standard DHF environment properties: mlHost, mlFinalPort +- You have already run uDeployModel successfully *Effects:* -- New plugins created under plugins/entities folder +- DHF 5.x - New entities created under entities folder +- DHF 4.1 - New plugins created under plugins/entities folder ### uCreateDHFHarmonizeFlow -*Purpose:*: Generate a harmonization flow based on your model. This conversion is smart, if you ask it to be. - -*DHF/Vanilla*: DHF - -*Input:* -- modelName - name of UML module file without .xml suffix -- entityName - name of the entity. You must already have created this using uCreateDHFEntities -- dataFormat: xml, json -- pluginFormat: xqy, sjs -- flowName: the harmonization flow name -- contentMode: possible values - * es - Entity Services mode. The cookie cutter generates ES-conversion style code and - incorporates hints from the data model and the mapping spec. This is like a souped up -useES option. - * dm - Declarative Mapper mode. *This feature is not ready yet.* -- mappingSpec: previously uploaded Excel mapping spec; refer to it by the Excel URI -- overwrite: true/false. If true and harmonization already exists, overwrite it. If you don't want to clobber, set to false. - -*Dependencies:* -- Your gradle project is DHF 4.1. If you prefer to use a more recent DHF 4.x release, make sure to change the DHF version in any *.gradle or gradle*.properties files you obtain from this toolkit. -- You have deployed your UML model -- You have created the entity in question using uCreateDHFEntities -- Standard DHF environment properties: mlHost, mlFinalPort - -*Effects:* -- New harmonization flow plugins/entities/entityName/harmonize folder +EOL. For DHF 4.1 only. See [../examples/hr](../examples/hr) and [../tutorials/employeeCradleToGrave.md](../tutorials/employeeCradleToGrave.md) for examples of use. ### uLoadMappingSpec -*Purpose:*: Load an Excel mapping spec, which indicates how to map source data to the model. Used in the above tasks. - -*Input:* -- specName = mandatory (Excel filename without suffix) -- discover = true/false; default false. *This is an experimental feature.* -- discoveryDB = default: content DB (non-DHF), staging DB (DHF0). *This is an experimental feature.* - -*Dependencies:* -- Your gradle project has the folder data/mapping -- Your mapping spec is in that folder -- Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... -- Standard DHF environment properties: mlHost, mlFinalPort - -*Effects:* -- Target database has the mapping spec (original Excel plus transformed json) +EOL. Used with DHF 4.1 architecture to generate helpful mapping/harmonization code. In DHF 5, mapping is declarative; the need for the capability is diminished. If you are still on DHF 4.1 and are interested in using this capability, refer to [../examples/hr](../examples/hr). ### uCreateConversionModule -*Purpose:* Creates a harmonize flow for the specified entity. A souped up es.instanceConverterGenerate. - -*Input:* -- modelName - name of UML module file without .xml suffix -- entityName - name of the entity. -- dataFormat: xml, json -- pluginFormat: xqy, sjs -- moduleName the module name -- contentMode: possible values - * es - Entity Services mode. The cookie cutter generates ES-conversion style code and - incorporates hints from the data model and the mapping spec. This is like a souped up -useES option. - * dm - Declarative Mapper mode. This feature is not ready yet. -- mappingSpec: previously uploaded Excel mapping spec; refer to it by the Excel URI -- overwrite: true/false. If true and the module already exists, overwrite it. If you don't want to clobber, set to false. - -*Dependencies:* -- You have deployed your UML model -- Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... -- Standard DHF environment properties: mlHost, mlFinalPort. BUT WE RECOMMEND USING uCreateDHFHarmonizeFlow IF YOU ARE ON DHF. - -*Effects:* -- New conversion module in src/main/ml-modules/root/modelName/entityName folder - -## Model/Conversion/Harmonization Workflow - -How do you string these tasks together to build useful code from a model? Here are a few scenario workflows: - -1. DHF environment with harmonization created by out-of-the-box DHF code generator. Example: [../tutorials/employeeCradleToGrave.md](../tutorials/employeeCradleToGrave.md). - - - Make a copy of [../uml2esTransform/uml2es4dhf.gradle](../uml2esTransform/uml2es4dhf.gradle) into your local gradle project. - - Run task uDeployModel. - - Generate entities using uCreateDHFEntities. - - Generate harmonizations using the out-of-the-box DHF createHarmonizeFlow task. These are created in the plugins/entities folder. - -2. DHF environment with harmonization created by UML2ES with mapping spec details and hints from the extended model. Example: [../examples/hr](../examples/hr). - - - Make a copy of [../uml2esTransform/uml2es4dhf.gradle](../uml2esTransform/uml2es4dhf.gradle) into your local gradle project. - - Run task uDeployModel. - - Deploy the mapping spec: uLoadMappingSpec - - Generate entities using uCreateDHFEntities - - Generate harmonizations using uCreateDHFHarmonizationFlow. The harmonization is created in plugins/entities. - -3. Vanilla environment with out-of-the-box ES code generation from the model, as in the [../examples/movies](../examples/movies) example: - - - Make a copy of [../uml2esTransform/uml2es.gradle](../uml2esTransform/uml2es.gradle) into your local gradle project. At the bottom of that file, set one of more generate flags to true. For example, to use ES to generate an instance converter and TDE template, set the following to true: - - generateInstanceConverter=true - - generateExtractionTemplate=true - - Run task uDeployModel. As a result of this, the generated instance converter is in src/main/ml-modules/ext. The generated TDE template is in src/main/ml-schemas. - -4. Vanilla environment with generation of UML2ES conversion module with mapping spec details and hints from the extended model. Example: [../examples/gentest/vanilla](../examples/gentest/vanilla) - - - Make a copy of [../uml2esTransform/uml2es.gradle](../uml2esTransform/uml2es.gradle) into your local gradle project. - - Run task uDeployModel. - - Load the mapping spec using uLoadMappingSpec. - - Generate the conversion module using uCreateConversionModule with contentMode=es. As a result of this, the generated conversion module is in src/main/ml-modules/root/esconversion. +EOL and not tested. Meant for vanilla architectures. Generates souped-up conversion code, more comprehensive that what ES generates out of the box. ## Build Tips The [../examples](../examples) and [../tutorials](../tutorials) of this toolkit show this gradle build in action. There are several ways to use it: -- Move it into your gradle project as a build script solely for UML2ES. Keep a separate build script for your main build work. The examples and tutorials take this approach. When using it this way, edit plugin versions if needed. +- Move it into your gradle project as a build script solely for UML2ES. Keep a separate build script for your main build work. The examples and tutorials take this approach. When using it this way, you might need to edit plugin versions in your copy of the UML2ES build file. For example, you might need to change the MLCP version or the version of the DHF plugin. - Copy its tasks into your existing gradle build file. -- Copy it into your gradle project and use it as your main gradle build file. Add app-specific build tasks to it as needed. +- Copy it into your gradle project and use it as your main gradle build file. Add app-specific build tasks to it for your own needs. The mega tutorial [../tutorials/employeeCradleToGrave.md](../tutorials/employeeCradleToGrave.md) demonstrates the gradle build as key ingredient in a soup-to-nuts modeling example for DHF. Please go through this tutorial to see how to: diff --git a/uml2es/docs/envelope.md b/uml2es/docs/envelope.md index 665878c..4d507bd 100644 --- a/uml2es/docs/envelope.md +++ b/uml2es/docs/envelope.md @@ -21,3 +21,5 @@ The toolkit's code generation feature builds code that persists your business da The following diagram shows how this works: ![Envelope](envelope.png) + + diff --git a/uml2es/docs/profile.md b/uml2es/docs/profile.md index 8202985..5927417 100644 --- a/uml2es/docs/profile.md +++ b/uml2es/docs/profile.md @@ -44,12 +44,14 @@ The following table describes each stereotype: |extended|Class|xDocument|permsCR|CSV string,string|0..*|This adds a fact indicating that the class contains the specified capability-role permissions. Currently these values must be fixed strings; they can't be dynamic. The transform's code generator uses this fact during generation of the writer module.| |extended|Class|xDocument|quality|int|0..1|This adds a fact indicating that the class has, for scoring purposes, the specified quality. Currently this value must be a static integer; it can't be dynamic. The transform's code generator uses this fact during generation of the writer module.| |extended|Class|xDocument|metadataKV|string|0..*|This adds a fact indicating that the class contains the specified key-vlaue metadata pairs. Currently these values must be fixed strings; they can't be dynamic. The transform's code generator uses this fact during generation of the writer module.| +|extended|Class|xDHFEntity||||This class is considered a primary entity in DHF.| +|extended|Class|xDocument|metadataKV|string|0..*|This adds a fact indicating that the class contains the specified key-vlaue metadata pairs. Currently these values must be fixed strings; they can't be dynamic. The transform's code generator uses this fact during generation of the writer module.| |extended|Attribute|xImplHints|reminders|string|0..*|This adds a reminder fact indicating that your attribute has the specified reminders. The reminder is the object of the semantic fact and is recorded in the fact as a string literal. The contents of the reminder can be just text (a "note to self") or can contain embedded code that you can evaluate at runtime. The contents are up to you.| |extended|Attribute|xImplHints|triplesPO|CSV iri,istring|0..*|This adds a fact about your attribute. What is that fact? Well, you get to decide what the predicate and object are. You specify them in tags. You can specify multiple triplePO values; for each the transform creates a fact indicating that the attribute for the specified predicate has the specified object. In "triplePO", P means predicate, O means object. You specify PO as a CSV string. P is a fully-qualified or prefixed IRI known at design time. O can be either an IRI (fully-qualified or prefixed) or a string literal. If it is an IRI, it must be known at design time. If it is a string literal, it's like the reminder hint: it can be loose text or executable code.| -|extended|Attribute|xCalculated|concat|xstring|0..*|This adds a fact indicating that the value of your attribute is the concatenation of the values indicated in the concat tag. Your attribute's type should be either string or IRI; if it is IRI, the concat (when all the components are combined) should evaluate to a valid IRI. Each term in the concat can be either a static or dyanmic string.| +|extended|Attribute|xCalculated|concat|xstring|0..*|This adds a fact indicating that the value of your attribute is the concatenation of the values indicated in the concat tag. Your attribute's type should be either string or IRI; if it is IRI, the concat (when all the components are combined) should evaluate to a valid IRI. Each term in the concat can be either a static or dyanmic string. THIS STEREOTYPE IS DEPRECATED because in DHF5.1+, you should use mapping to calculate.| |extended|Attribute|xURI||||This adds a fact indicating that value of the attribute functions as the URI of an instance of the class. This stereotype has no tag. If you wish to specify how the URI is constructed, stereotype the same attribute as concat and build the URI that way. The transform's code generator uses this fact during generation of the writer module.| |extended|Attribute|xBizKey||||This adds a fact indicating that the attribute is a business key of the class.| -|extended|Attribute|xHeader|field|xstring|1|This adds a fact indicating that this attribute should be added to the envelope header. The name of the header field is given by the tag "field", which can be a static name or dynamically evaluated. The value of the header field is the value of the attribute. The transform's code generator uses this fact during generation of the headers module.| +|extended|Attribute|xHeader|field|xstring|1|This adds a fact indicating that this attribute should be added to the envelope header. The name of the header field is given by the tag "field", which can be a static name or dynamically evaluated. The value of the header field is the value of the attribute. The transform's code generator uses this fact during generation of the headers module. THIS STEREOTYPE IS DEPRECATED if you are using DHF5, which does not expose header manipulation.| |semantic|Model|semPrefixes|prefixesPU|CSV string,string|1..*|Here you define prefixes of IRIs that you refer to in the other semantic stereotypes. In the tag prefixesPU, you write each prefix as a comma-separated string of prefix and URL. You can define multiple prefixes. You don't need to define common prefixes like owl, rdf, foaf; for a complete list of pre-defined prefixes, see .| |semantic|Class|semType|types|iri|1..*|Here you specify the RDF types that document instances of the class belong to. This stereotype is used by the tranform's code generator to build the triples section of the document envelope. For each type you specify in the types tag, the generator creates a triple SPO, where S is the semIRI of the instance, P is the rdf:type predicate, and O is the specified semantic type. You can specify the as fully-qualified or prefixed.| |semantic|Class|semFacts|facts_sPO|CSV xiany?,xiany,xiany|1..*|This experimental stereotype allows you to build arbitrary triples for a document instance of your class. The transform's code generator adds these triples to the document envelope. You can add as many facts as you like. For each, the tag facts_sPO specifies the subject, predicate, and object of the triple. The subject is optional; if you omit it, the subject is the semIRI of the class. All values can be either static or dynamic. The [JokeBook example](../examples/jokeBook) shows the use of this stereotype.| @@ -159,6 +161,7 @@ The following table summarizes how the transform resolves class stereotype inher |---|---|---|---| |core|xmlNamespace|Inherited but subclass can override it by defining the same stereotype.|UML-to-ES generator| |core|exclude|Not inherited. The superclass is excluded, but subclasses are by default included. The [movies example](../examples/movies) shows the utility of using the superclass merely to define common attributes. In that example the superclass, Contributor, is excluded from the ES model. Its subclasses -- PersonContributor and CompanyContributor -- are included and inherit the attributes of Contributor.|UML-to-ES generator| +|extended|xDHFEntity|Not inherited.| |extended|xImplHints|Not inherited. Hints are part of the extended model and used only in comment blocks and by code generators. Whoever's watching can apply the hints to subclasses if it deems appropriate.|Your code/code generator.| |extended|xDocument|Inherited. If subclass also defines this stereotype it is ADDING. To have the subclass REPLACE/OVERRIDE rather than ADD, it should drop a hint.|DHF code generator. Your code generator or code.| |sem|semTypes|Inherited. If subclass also defines this stereotype it is ADDING. To have the subclass REPLACE/OVERRIDE rather than ADD, it should drop a hint.|DHF code generator. Your code generator or code.| diff --git a/uml2es/docs/semantics.md b/uml2es/docs/semantics.md index 2eceb09..3bb2105 100644 --- a/uml2es/docs/semantics.md +++ b/uml2es/docs/semantics.md @@ -2,7 +2,7 @@ Among the capabilities of the toolkit is the ability to model semantics. Specificially, the toolkit supports a mixed modelling approach in which documents contain embedded semantic triples. Those triples constitute semantic facts about the document, such as the document's provenance and its relationship to other semantic things. -The toolkit is NOT meant to design semantic ontologies. Indeed, UML isn't a suitable notation for ontological design. There are several patterns in OWL that cannot easily be expressed in UML's class notation. (For example: an individual can belong to multiple classes; a property can have multiple domains; a property can have no domain; a class can be defined as the intersection of two other classes.) If you need to build an ontology, use an ontology tool, such as Protege or TopBraid Composer. +The toolkit is NOT meant to design semantic ontologies. Indeed, UML isn't a suitable notation for ontological design. There are several patterns in OWL that cannot easily be expressed in UML's class notation. (For example: an individual can belong to multiple classes; a property can have multiple domains; a property can have no domain; a class can be defined as the intersection of two other classes.) If you need to build an ontology, use an ontology tool such as Protege or TopBraid Composer. The toolkit allows you associate semantic facts with your class definition. You model these facts using stereotypes. Your facts can reference ontologies. In the examples described below, UML classes reference provenance and organizational ontologies. diff --git a/uml2es/docs/uml_mapping.md b/uml2es/docs/uml_mapping.md index 613cb59..19029ed 100644 --- a/uml2es/docs/uml_mapping.md +++ b/uml2es/docs/uml_mapping.md @@ -47,6 +47,8 @@ Cons: ### 2. Several Models Linked by UML Tool +TODO - update once parent/child is made available . . + Build several models linked by the UML tool. Suppose model M contains class C. In model N, I want class D to contain an attribute that refers to class C. UML tools support this by allowing package import: - In model M, I ensure class C belongs to a package. diff --git a/uml2es/examples/README.md b/uml2es/examples/README.md index 1c8be7d..b84fe5c 100644 --- a/uml2es/examples/README.md +++ b/uml2es/examples/README.md @@ -1,30 +1,14 @@ -Summary of examples: +The examples show various uses of UML2ES. The table summarizes the examples: -- examples/movies: A sample UML model for movies. Includes ml-gradle build file to load this model into MarkLogic. Shows the full UML-to-ES workflow including ingestion of ES envelopes, deploying ES-generated database indexes, and running SQL against TDE views. The movie model demonstrates several types of document relationships. -- examples/hr: A sample UML model for human resources. It models Departments and Employees. The sample shows how to load HR data into a MarkLogic data hub. It also demonstrates semantic relationships though the use of an organizational ontology. Additionally, it showcases the *Data Hub Framework Cookie Cutter* to generate hub entities and harmonization flows. -- examples/runningRace: A sample demonstrating interop. We model a running race in three UML editors: MagicDraw, Eclipse Modeling Framework (EMF), and Papyrus. We show that all UML models transfor to the same ES model descriptor. Our model is based on one of the examples from MarkLogic's Entity Services github: . -- examples/blockFactory: A sample UML model that shows a technique for denormalization. -- examples/movietalk: A UML logcal data model for user posts about movies and actors. The model is merely logical. We do not generate an Entity Services model from it. Rather, when the application team built the movietalk application, they referred to the model but arranged the data in MarkLogic somewhat differently. The example demonstrates a strategy to compare the physical model to the logical model. -- examples/hrexcel: Demonstrates loading an entity services model from an Excel data model template. No UML! We use the HR example from above (examples/hr). We pass our Excel spreadsheet (containing the HR model in tablular form) into the transformation. The transformation produces the same entity services model (including extensions and generated code) as produces from the UML model in examples/hr. -- examples/declarativeCity: A simple city data model that uses the Declarative Mapper tool to map source data. The example shows the integration of UML, Entity Services, and Declarative Mapper. -- examples/jokeBook: A mixed model demonstrating advanced semantic relationships like qualified predicates and arbitrary semantic facts. -- examples/gentest: Code generation tests. -- examples/umlModels: The full set of models - -The following table summarizes the features demonstrated in the examples: - -|Feature|Example| -|---|---| -|DHF|hr, gentest| -|UML class relationships|movies, blockFactory| -|Mapping spec|hr| -|Cookie cutter|hr, gentest| -|Model comparison|runningRace, hrexcel| -|Logical vs. physical|movietalk| -|Interop|runningRace| -|Discovery|movieTalk, hr| -|ES conversion module|movies| -|Declarative Mapper|declarativeCity, hr (COMING SOON)| -|TDE|movies| -|Semantics|hr, jokeBook| -|Excel2ES|hrexcel| +|Example|Features|Architecture|Modeling Tools|Status| +|---|---|---|---|---| +|[patient-hub](patient-hub)|Mapping UML to DHF5 entities.|DHF 5|Papyrus|complete| +|hr5WithTDE|HR UML model with semantic relationships in DHF5. Shows how to split UML model into main and common submodels and link them together. Shows use of TDE template to generate semantic triples for class relationships.|DHF 5|Papyrus s|Coming soon - Summer/fall 2020| +|[decomposedModels](decomposedModels)|Decompose large UML model over multiple smaller models. Demonstrate how to map to ES.|Vanilla|Papyrus and MagicDraw|TODO| +|ontology2ES|How to generate an ES model from a semantic ontology.|Vanilla|Papyrus|CComing soon - Summer/fall 2020| +|[movies](movies)|UML class relationships and how to map them to ES. Vanilla build process. Using OOTB ES artifact generator for conversion, indexes, and TDE.|Vanilla|MagicDraw|complete| +|[hr](hr)|UML model with semantic relationships and how to map them to ES. Generating harmonization code for DHF 4 based on model. Building the full envelope based on model. Incorporating mapping spec from mapping domain expert. DHF 4.1 build process.|DHF4.1|MagicDraw|complete| +|[hrexcel](hrexcel)|Using Excel spreadsheet to design a model equivalent to HR data model. Model comparison|Vanilla|Excel|complete| +|[runningRace](runningRace)|Compare equivalent model from three tools: MagicDraw, Papyrus, Eclipse EMF. Interop. Model comparison.|Vanilla|MagicDraw, Papyrus, Eclipse EMF|complete| +|[movieTalk](movieTalk)|Logical model. Lax model transformation. Compare logical and physical.|Vanilla|Papyrus|complete| +|[jokeBook](jokeBook)|Advanced mixed document/semantic modeling.|Vanilla|Papyrus|complete| diff --git a/uml2es/examples/blockFactory/README.md b/uml2es/examples/blockFactory/README.md deleted file mode 100644 index 325a9df..0000000 --- a/uml2es/examples/blockFactory/README.md +++ /dev/null @@ -1,137 +0,0 @@ -# Block Factory Example - -## Intro -This sample demonstrates denormalization. In our block factory data model we see the common "BOM/part" No-SQL pattern. The block factory manufactures wooden and platic blocks of various colors and sizes. It also bundles blocks into "block models". An example of a block model is the Taj Mahal; the user of the model constructs a model of the Taj Mahal using the blocks provided. Think of the model as a bill of materials (BOM). The materials are the blocks. Conceptually the model "contains" blocks. From a design perspective, we have several ways to model that containment relationship: - -- Have the model contain the full details of each block. We prefer not to do this because the block is a first-class entity, which ought to be modeled as its own document type. -- Have the model refer to its blocks by key. We prefer not to do this because then we need to join model to block every time we want -view the contents of the model. -- Have the model contain an abbreviated and denormalized summary of each block. That's what we will do. There is lots of infomation to be gleaned about a block; the model includes just enough information to present an adequate bill of materials. If someone wants to know the full details of a block, he/she can obtain that block separately and inspect its structure. - -Our model indicates, using a hint stereotype, that the relationship is abbreviated and denormalized. It does not describe exactly how this abbreviation and denormalization is represented; that's an implementation detail. - -## Models -Here is the MagicDraw model: - -![BlockFactory](../umlModels/BlockFactory.png) - -## The Cooking Show Approach - -Like a cooking show, this example describes how to prepare the souffle but also gives a souffle already prepred for you to consume. - -The "prepared" souffle includes: -- The UML model. -- MLCP gradle tasks to ingest block source data and transform it to the form of the model -- ES instance converter already modified to address source-to-model mapping issues. Used in MLCP tasks. - -If you were to start from scratch, you would follow this recipe: -- Devise the UML model in your favorite UML editor. -- Use the XMI to ES transformation to map the UML model to Entity Services. -- From the Entity Services model, generate the instance converter. -- Tweak the instance converter to propertly map source fields to model fields. -- In your gradle build file, add MLCP tasks to ingest data. - -## How to run: - -Our project uses gradle. Before running, view the settings in gradle.properties. Create a file called gradle-local.properties and in this file override any of the properties from gradle.properties. - -Here are the steps to setup. - -### Setup DB -Setup new DB. Will use basic DB config with no indexes. Will bring in XMI2ES transform to our modules. - -Run the following: - -gradle -PenvironmentName=local -i deleteGenerated setup mlDeploy - -Confirm: -- Content DB is empty -- Modules DB includes these modules - * /xmi2es/xmi2esTransform.xqy - Main module of the toolkit's transform - * /ext/entity-services/BlockFactory-0.0.1.xqy - Converter module for Block Factory. It was generated by ES but tweaked. Pre cooked! - * /xmi2es/loadBlockFactoryTransformation.xqy - MLCP transform: on ingest of block source data invokes ES converter module - -### Edit the uml2es.gradle to enable index and TDE generation -In the previous step you copied the uml2es.gradle file from the toolkit's uml2esTransform folder. That file is configured to disable instance converter generation for the ES model. We want that generation in this example, so let's turn it on. Edit the uml2es.gradle file in this project folder. Change the last block by setting generatedInstanceConverter to true. - -Here is what that block should look like: - -/* -Edit this to enable/disable code generation of mlGenerateModelArtifacts -*/ -ext { - def mdb = project.findProperty("mlFinalDbName") - if (mdb == null) mdb = project.findProperty("mlAppName" + "-content") - mlAppConfig { - modelsDatabase=mdb - generateInstanceConverter=true - generateSchema=false - generateDatabaseProperties=false - generateExtractionTemplate=false - generateSearchOptions=false - } -} - -### Transform UML to ES -Next, move our UML model into ML as an ES model. Let's divide this into two parts. - -#### Load UML Model and Observe Output of Transform - -We will load our UML model and transform it to Entity Services format. Run the following: - -gradle -b uml2es.gradle -PenvironmentName=local -i -PmodelName=BlockFactory uDeployModel - -Confirm: -- Content DB has the following documents - * /marklogic.com/entity-services/models/BlockFactory.json (The ES model descriptor in JSON form) - * /xmi2es/extension/BlockFactory.ttl (Semantic triples that extend our model) - * /xmi2es/extension/BlockFactory.txt (A text summary of our model extension) - * /xmi2es/findings/BlockFactory.xml (Problems found during transformation) -- Your gradle directory structure under data/entity-services-dump has the same documents as above. - -Check /xmi2es/findings/BlockFactory.xml for issues during transform. It should not indicate any issues. - -Notice we made use of the extended model definition. Specifically, we pasted the contents of /xmi2es/extension/BlockFactory.txt as a block comment into our conversion module plugins/ext/entity-services/BlockFactory-0.0.1.xqy. We refer back to that comment in several points in the code, showing that our implementation references facts from the extended model. - -- In Query Console, open a tab of type SPARQL, point to the content DB, run the following query, and verify you get any results. This means the ES model is in FINAL and its semantic metadata is populated. - -select * where {?s ?o ?p} - -Among the results, you should see the following: -- http://com.marlogic.es.umldemo.blockfactory/BlockFactory-0.0.1/BlockModelPart/blockSummary> - From basic ES model -- "abbrev and denorm>" - From the extended ES model - -- In gradle project, check for these newly generated files: - * src/main/ml-modules/ext/entity-services/BlockFactory-0.0.1-GENERATED.xqy - -We won't use any of these artifacts in this demo. The code already contains a tweaked version of BlockFactory-0.0.1.xqy in /plugins/ext/entity-services. Because we won't use these artifacts, we don't need to reload our schemas or modules. - -### Ingest -Ingest block factory data based on the model - -Run the following: - -gradle -PenvironmentName=local -i ingestBlockData - -Confirm: -- Content DB now has numerous block factory documents. - * block - 1000 - * color - 358 - * model - 2 - * client - 1 - * custom - 1 - * material - 4 - -Here is some Javascript to get these counts: - -var directories = ["block", "color", "model", "client", "custom", "material"]; -var counts = []; -for (var i = 0; i < directories.length; i++) { - counts.push(directories[i]); - counts.push(cts.estimate(cts.directoryQuery("/xmi2es/blockFactory/" + directories[i] + "/"))); -} -counts - -## Explore Data -In Query Console, import XMI2ESBlockFactory.xml workspace. In each tab, try the query to explore an aspect of the data. - diff --git a/uml2es/examples/blockFactory/XMI2ESBlockFactory.xml b/uml2es/examples/blockFactory/XMI2ESBlockFactory.xml deleted file mode 100644 index 58a0a29..0000000 --- a/uml2es/examples/blockFactory/XMI2ESBlockFactory.xml +++ /dev/null @@ -1,41 +0,0 @@ -'use strict'; - -/* -This shows a model, one of its blocks, that block's color, and that block's material. -Notice in the model JSON how the blocks are presented in abbreviated and denormalized fashion. -RUN THIS AGAINST THE BLOCK CONTENT DB. -*/ - -[ - "model", - cts.doc("/xmi2es/blockFactory/model/TajMahal.json"), - "block", - cts.doc("/xmi2es/blockFactory/block/block573.json"), - "color", - cts.doc("/xmi2es/blockFactory/color/YG09.json"), - "material", - cts.doc("/xmi2es/blockFactory/material/mspruce.json") -] -'use strict'; - -/* -This shows a count of each of the block factory document types. -RUN THIS AGAINST THE BLOCK CONTENT DB. -*/ - -var directories = ["block", "color", "model", "client", "custom", "material"]; -var counts = []; -for (var i = 0; i < directories.length; i++) { - counts.push(directories[i]); - counts.push(cts.estimate(cts.directoryQuery("/xmi2es/blockFactory/" + directories[i] + "/"))); -} -counts - -'use strict'; - -/* -This shows a list of all standard and custom models. -RUN THIS AGAINST THE BLOCK CONTENT DB. -*/ - -cts.uris(null,null, cts.collectionQuery("product")) diff --git a/uml2es/examples/blockFactory/build.gradle b/uml2es/examples/blockFactory/build.gradle deleted file mode 100755 index 0b2f662..0000000 --- a/uml2es/examples/blockFactory/build.gradle +++ /dev/null @@ -1,127 +0,0 @@ -buildscript { - - repositories { - jcenter{url "http://jcenter.bintray.com/"} - mavenLocal() - maven { url "http://plugins.gradle.org/m2" } - } - dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" - classpath "net.saliman:gradle-properties-plugin:1.4.6" - } -} - -apply plugin: "net.saliman.properties" -apply plugin: "com.marklogic.ml-gradle" - -repositories { - jcenter{url "http://jcenter.bintray.com/"} - - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } - - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } -} - -configurations { - // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want - // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as - // shown below. Need to force to use certain version of xml-apis library. - mlcp { - resolutionStrategy { - force "xml-apis:xml-apis:1.4.01" - } - } -} - -dependencies { - mlcp "com.marklogic:mlcp:9.0.6" - mlcp "org.apache.commons:commons-csv:1.2" - mlcp files("lib") -} - -task ingestBlockData -["client", "color", "material", "block", "model", "custom"].each { entityType -> - task "ingestEntity${entityType}"(type: com.marklogic.gradle.task.MlcpTask) { - - def dataDir = "${projectDir}"; - def unixDir = dataDir.replace('\\', '/'); - def regexDir = unixDir+"/data/blockfactory/${entityType}" - def regex = '"' + regexDir + ",'',/,'',.json,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - database = mlAppConfig.contentDatabaseName - document_type = "json" - input_file_path = "data/blockfactory/${entityType}" - input_file_type = "documents" - output_uri_replace = regex - output_uri_prefix = "/xmi2es/blockFactory/${entityType}/" - output_uri_suffix = ".json" - output_collections = "xmi2es,blockFactory" - output_permissions = "rest-reader,read,rest-writer,update" - host = mlAppServicesHost - port = mlAppServicesPort.toInteger() - transform_module = "/xmi2es/loadBlockFactoryTransformation.xqy" - transform_namespace ="http://marklogic.com/xmi2es/blockFactory" - transform_param = "${entityType}" - - } - ingestBlockData.dependsOn "ingestEntity${entityType}" -} - -tasks.findByName('ingestEntitymodel').mustRunAfter 'ingestEntityblock' -tasks.findByName('ingestEntitymodel').mustRunAfter 'ingestEntitymaterial' -tasks.findByName('ingestEntitymodel').mustRunAfter 'ingestEntitycolor' -tasks.findByName('ingestEntitycustom').mustRunAfter 'ingestEntityblock' -tasks.findByName('ingestEntitycustom').mustRunAfter 'ingestEntitymaterial' -tasks.findByName('ingestEntitycustom').mustRunAfter 'ingestEntitycolor' - -task includeXMI2ESTransform(type: Copy) { - from "../../uml2esTransform/src/main/ml-modules/root/xmi2es" - into "src/main/ml-modules/root/xmi2es" -} - -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/BlockFactory.xml" - into "data/model" -} - -task includeUGradle() { - // Don't use Copy task bcuz file locking into gradle project dir on Windows - doLast { - copy { - from "../../uml2esTransform/uml2es.gradle" - into "." - } - } -} - -task setup() { - dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') - dependsOn('includeUGradle') -} - -task deleteGenerated(type: Delete) { - delete "src/main/ml-modules/ext/entity-services/BlockFactory-0.0.1-GENERATED.xqy" -} - -/* -Edit this to enable/disable code generation of mlGenerateModelArtifacts -*/ -ext { - def mdb = project.findProperty("mlFinalDbName") - if (mdb == null) mdb = project.findProperty("mlAppName" + "-content") - mlAppConfig { - modelsDatabase=mdb - generateInstanceConverter=true - generateSchema=false - generateDatabaseProperties=false - generateExtractionTemplate=false - generateSearchOptions=false - } -} diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block0.json b/uml2es/examples/blockFactory/data/blockfactory/block/block0.json deleted file mode 100644 index 02e89fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block0.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block0", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"W0", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block1.json b/uml2es/examples/blockFactory/data/blockfactory/block/block1.json deleted file mode 100644 index f4b6623..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block1.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block1", "length":2, "width":5, "height":1, "mass":2, "colorCode":"YR12", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block10.json b/uml2es/examples/blockFactory/data/blockfactory/block/block10.json deleted file mode 100644 index 8783133..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block10.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block10", "length":1, "width":3, "height":5, "mass":3, "colorCode":"BV0000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block100.json b/uml2es/examples/blockFactory/data/blockfactory/block/block100.json deleted file mode 100644 index 308db65..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block100.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block100", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"V04", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block101.json b/uml2es/examples/blockFactory/data/blockfactory/block/block101.json deleted file mode 100644 index 11016ad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block101.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block101", "length":1, "width":3, "height":3, "mass":1.8, "colorCode":"G03", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block102.json b/uml2es/examples/blockFactory/data/blockfactory/block/block102.json deleted file mode 100644 index 9bef5e9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block102.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block102", "length":1, "width":3, "height":5, "mass":3, "colorCode":"B21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block103.json b/uml2es/examples/blockFactory/data/blockfactory/block/block103.json deleted file mode 100644 index 13b03ef..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block103.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block103", "length":3, "width":4, "height":5, "mass":12, "colorCode":"W00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block104.json b/uml2es/examples/blockFactory/data/blockfactory/block/block104.json deleted file mode 100644 index a0e1c26..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block104.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block104", "length":1, "width":1, "height":4, "mass":0.8, "colorCode":"YG13", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block105.json b/uml2es/examples/blockFactory/data/blockfactory/block/block105.json deleted file mode 100644 index 331b911..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block105.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block105", "length":4, "width":1, "height":4, "mass":0.8, "colorCode":"YG07", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block106.json b/uml2es/examples/blockFactory/data/blockfactory/block/block106.json deleted file mode 100644 index 47753c3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block106.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block106", "length":1, "width":1, "height":4, "mass":0.2, "colorCode":"G20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block107.json b/uml2es/examples/blockFactory/data/blockfactory/block/block107.json deleted file mode 100644 index 8614266..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block107.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block107", "length":3, "width":3, "height":4, "mass":7.2, "colorCode":"E87", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block108.json b/uml2es/examples/blockFactory/data/blockfactory/block/block108.json deleted file mode 100644 index 50f3f92..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block108.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block108", "length":1, "width":5, "height":5, "mass":1.25, "colorCode":"G0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block109.json b/uml2es/examples/blockFactory/data/blockfactory/block/block109.json deleted file mode 100644 index 66743ba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block109.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block109", "length":1, "width":3, "height":2, "mass":1.2, "colorCode":"BG15", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block11.json b/uml2es/examples/blockFactory/data/blockfactory/block/block11.json deleted file mode 100644 index 7e73a98..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block11.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block11", "length":4, "width":3, "height":4, "mass":9.6, "colorCode":"RV000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block110.json b/uml2es/examples/blockFactory/data/blockfactory/block/block110.json deleted file mode 100644 index 7ff7582..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block110.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block110", "length":3, "width":4, "height":3, "mass":7.2, "colorCode":"E47", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block111.json b/uml2es/examples/blockFactory/data/blockfactory/block/block111.json deleted file mode 100644 index 56697e6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block111.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block111", "length":4, "width":2, "height":2, "mass":0.8, "colorCode":"YG25", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block112.json b/uml2es/examples/blockFactory/data/blockfactory/block/block112.json deleted file mode 100644 index 9c74dcb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block112.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block112", "length":3, "width":2, "height":3, "mass":3.6, "colorCode":"E55", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block113.json b/uml2es/examples/blockFactory/data/blockfactory/block/block113.json deleted file mode 100644 index 515b7af..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block113.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block113", "length":4, "width":2, "height":3, "mass":1.2, "colorCode":"RV95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block114.json b/uml2es/examples/blockFactory/data/blockfactory/block/block114.json deleted file mode 100644 index 5f9b2df..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block114.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block114", "length":2, "width":1, "height":3, "mass":0.3, "colorCode":"B16", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block115.json b/uml2es/examples/blockFactory/data/blockfactory/block/block115.json deleted file mode 100644 index 0741727..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block115.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block115", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"G12", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block116.json b/uml2es/examples/blockFactory/data/blockfactory/block/block116.json deleted file mode 100644 index fdae8e5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block116.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block116", "length":4, "width":3, "height":5, "mass":3, "colorCode":"E70", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block117.json b/uml2es/examples/blockFactory/data/blockfactory/block/block117.json deleted file mode 100644 index 595d88c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block117.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block117", "length":3, "width":3, "height":1, "mass":1.8, "colorCode":"W1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block118.json b/uml2es/examples/blockFactory/data/blockfactory/block/block118.json deleted file mode 100644 index 50add10..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block118.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block118", "length":4, "width":2, "height":5, "mass":8, "colorCode":"E55", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block119.json b/uml2es/examples/blockFactory/data/blockfactory/block/block119.json deleted file mode 100644 index fc16bca..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block119.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block119", "length":1, "width":3, "height":2, "mass":1.2, "colorCode":"G00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block12.json b/uml2es/examples/blockFactory/data/blockfactory/block/block12.json deleted file mode 100644 index ffccf6a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block12.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block12", "length":5, "width":2, "height":2, "mass":1, "colorCode":"BV000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block120.json b/uml2es/examples/blockFactory/data/blockfactory/block/block120.json deleted file mode 100644 index d990ad2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block120.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block120", "length":3, "width":5, "height":4, "mass":3, "colorCode":"BG07", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block121.json b/uml2es/examples/blockFactory/data/blockfactory/block/block121.json deleted file mode 100644 index b2ff4a5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block121.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block121", "length":3, "width":1, "height":3, "mass":1.8, "colorCode":"YG0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block122.json b/uml2es/examples/blockFactory/data/blockfactory/block/block122.json deleted file mode 100644 index 6d8233b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block122.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block122", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"V20", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block123.json b/uml2es/examples/blockFactory/data/blockfactory/block/block123.json deleted file mode 100644 index 9d22883..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block123.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block123", "length":4, "width":2, "height":5, "mass":8, "colorCode":"Y21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block124.json b/uml2es/examples/blockFactory/data/blockfactory/block/block124.json deleted file mode 100644 index 7605c64..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block124.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block124", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"E07", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block125.json b/uml2es/examples/blockFactory/data/blockfactory/block/block125.json deleted file mode 100644 index 577253c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block125.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block125", "length":4, "width":3, "height":3, "mass":7.2, "colorCode":"YG67", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block126.json b/uml2es/examples/blockFactory/data/blockfactory/block/block126.json deleted file mode 100644 index f65d640..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block126.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block126", "length":5, "width":2, "height":4, "mass":8, "colorCode":"E81", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block127.json b/uml2es/examples/blockFactory/data/blockfactory/block/block127.json deleted file mode 100644 index 7a43643..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block127.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block127", "length":3, "width":1, "height":1, "mass":0.15, "colorCode":"G14", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block128.json b/uml2es/examples/blockFactory/data/blockfactory/block/block128.json deleted file mode 100644 index 90ade7e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block128.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block128", "length":4, "width":1, "height":5, "mass":1, "colorCode":"R01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block129.json b/uml2es/examples/blockFactory/data/blockfactory/block/block129.json deleted file mode 100644 index 150237a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block129.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block129", "length":5, "width":3, "height":1, "mass":3, "colorCode":"RV25", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block13.json b/uml2es/examples/blockFactory/data/blockfactory/block/block13.json deleted file mode 100644 index 81f24f7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block13.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block13", "length":3, "width":5, "height":3, "mass":9, "colorCode":"YG61", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block130.json b/uml2es/examples/blockFactory/data/blockfactory/block/block130.json deleted file mode 100644 index 34440dd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block130.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block130", "length":1, "width":1, "height":2, "mass":0.4, "colorCode":"BV08", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block131.json b/uml2es/examples/blockFactory/data/blockfactory/block/block131.json deleted file mode 100644 index e258b62..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block131.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block131", "length":1, "width":5, "height":2, "mass":2, "colorCode":"R01", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block132.json b/uml2es/examples/blockFactory/data/blockfactory/block/block132.json deleted file mode 100644 index c4af271..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block132.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block132", "length":5, "width":5, "height":1, "mass":1.25, "colorCode":"V0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block133.json b/uml2es/examples/blockFactory/data/blockfactory/block/block133.json deleted file mode 100644 index 2b5eb76..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block133.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block133", "length":5, "width":1, "height":1, "mass":1, "colorCode":"BV31", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block134.json b/uml2es/examples/blockFactory/data/blockfactory/block/block134.json deleted file mode 100644 index 062071d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block134.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block134", "length":3, "width":5, "height":2, "mass":6, "colorCode":"R22", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block135.json b/uml2es/examples/blockFactory/data/blockfactory/block/block135.json deleted file mode 100644 index 227c152..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block135.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block135", "length":1, "width":2, "height":3, "mass":0.3, "colorCode":"FV2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block136.json b/uml2es/examples/blockFactory/data/blockfactory/block/block136.json deleted file mode 100644 index 1b22b87..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block136.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block136", "length":1, "width":4, "height":3, "mass":0.6, "colorCode":"G19", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block137.json b/uml2es/examples/blockFactory/data/blockfactory/block/block137.json deleted file mode 100644 index b9e10fa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block137.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block137", "length":2, "width":4, "height":4, "mass":1.6, "colorCode":"V22", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block138.json b/uml2es/examples/blockFactory/data/blockfactory/block/block138.json deleted file mode 100644 index 62a0a95..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block138.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block138", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"E44", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block139.json b/uml2es/examples/blockFactory/data/blockfactory/block/block139.json deleted file mode 100644 index cfa6517..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block139.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block139", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"Y0000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block14.json b/uml2es/examples/blockFactory/data/blockfactory/block/block14.json deleted file mode 100644 index 4bef9a2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block14.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block14", "length":1, "width":2, "height":1, "mass":0.1, "colorCode":"W2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block140.json b/uml2es/examples/blockFactory/data/blockfactory/block/block140.json deleted file mode 100644 index 5317297..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block140.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block140", "length":5, "width":1, "height":4, "mass":4, "colorCode":"R02", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block141.json b/uml2es/examples/blockFactory/data/blockfactory/block/block141.json deleted file mode 100644 index 56bac86..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block141.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block141", "length":2, "width":3, "height":5, "mass":6, "colorCode":"FV2", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block142.json b/uml2es/examples/blockFactory/data/blockfactory/block/block142.json deleted file mode 100644 index 9f67ad5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block142.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block142", "length":5, "width":2, "height":4, "mass":8, "colorCode":"B14", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block143.json b/uml2es/examples/blockFactory/data/blockfactory/block/block143.json deleted file mode 100644 index cb65cb5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block143.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block143", "length":2, "width":2, "height":1, "mass":0.2, "colorCode":"BG34", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block144.json b/uml2es/examples/blockFactory/data/blockfactory/block/block144.json deleted file mode 100644 index d3b805c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block144.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block144", "length":3, "width":2, "height":3, "mass":3.6, "colorCode":"B63", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block145.json b/uml2es/examples/blockFactory/data/blockfactory/block/block145.json deleted file mode 100644 index e7a54dc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block145.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block145", "length":3, "width":4, "height":3, "mass":7.2, "colorCode":"BG13", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block146.json b/uml2es/examples/blockFactory/data/blockfactory/block/block146.json deleted file mode 100644 index f15fb37..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block146.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block146", "length":3, "width":3, "height":3, "mass":5.4, "colorCode":"YR23", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block147.json b/uml2es/examples/blockFactory/data/blockfactory/block/block147.json deleted file mode 100644 index 4bfd8f1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block147.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block147", "length":3, "width":3, "height":5, "mass":9, "colorCode":"BV13", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block148.json b/uml2es/examples/blockFactory/data/blockfactory/block/block148.json deleted file mode 100644 index 736785e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block148.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block148", "length":2, "width":1, "height":5, "mass":2, "colorCode":"N3", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block149.json b/uml2es/examples/blockFactory/data/blockfactory/block/block149.json deleted file mode 100644 index 5888884..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block149.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block149", "length":1, "width":1, "height":2, "mass":0.1, "colorCode":"R30", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block15.json b/uml2es/examples/blockFactory/data/blockfactory/block/block15.json deleted file mode 100644 index acfbf82..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block15.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block15", "length":4, "width":2, "height":4, "mass":6.4, "colorCode":"R43", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block150.json b/uml2es/examples/blockFactory/data/blockfactory/block/block150.json deleted file mode 100644 index 0d66781..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block150.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block150", "length":1, "width":2, "height":4, "mass":1.6, "colorCode":"RV04", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block151.json b/uml2es/examples/blockFactory/data/blockfactory/block/block151.json deleted file mode 100644 index f5f1b4f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block151.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block151", "length":1, "width":4, "height":5, "mass":4, "colorCode":"YG99", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block152.json b/uml2es/examples/blockFactory/data/blockfactory/block/block152.json deleted file mode 100644 index 2e65a01..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block152.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block152", "length":5, "width":4, "height":4, "mass":16, "colorCode":"C9", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block153.json b/uml2es/examples/blockFactory/data/blockfactory/block/block153.json deleted file mode 100644 index 766be55..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block153.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block153", "length":5, "width":2, "height":1, "mass":0.5, "colorCode":"Y08", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block154.json b/uml2es/examples/blockFactory/data/blockfactory/block/block154.json deleted file mode 100644 index d572f25..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block154.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block154", "length":3, "width":3, "height":2, "mass":0.9, "colorCode":"FBG2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block155.json b/uml2es/examples/blockFactory/data/blockfactory/block/block155.json deleted file mode 100644 index 57d9c66..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block155.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block155", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"E95", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block156.json b/uml2es/examples/blockFactory/data/blockfactory/block/block156.json deleted file mode 100644 index e5908c6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block156.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block156", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"W7", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block157.json b/uml2es/examples/blockFactory/data/blockfactory/block/block157.json deleted file mode 100644 index fe1a445..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block157.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block157", "length":5, "width":3, "height":3, "mass":9, "colorCode":"B32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block158.json b/uml2es/examples/blockFactory/data/blockfactory/block/block158.json deleted file mode 100644 index a37ec30..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block158.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block158", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"Y13", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block159.json b/uml2es/examples/blockFactory/data/blockfactory/block/block159.json deleted file mode 100644 index 435e9cc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block159.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block159", "length":2, "width":4, "height":5, "mass":2, "colorCode":"BV01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block16.json b/uml2es/examples/blockFactory/data/blockfactory/block/block16.json deleted file mode 100644 index 8c945f5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block16.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block16", "length":5, "width":3, "height":5, "mass":15, "colorCode":"E42", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block160.json b/uml2es/examples/blockFactory/data/blockfactory/block/block160.json deleted file mode 100644 index c54893c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block160.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block160", "length":4, "width":3, "height":5, "mass":12, "colorCode":"R29", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block161.json b/uml2es/examples/blockFactory/data/blockfactory/block/block161.json deleted file mode 100644 index 113aa08..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block161.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block161", "length":3, "width":5, "height":1, "mass":3, "colorCode":"BG34", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block162.json b/uml2es/examples/blockFactory/data/blockfactory/block/block162.json deleted file mode 100644 index b464458..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block162.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block162", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"YG93", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block163.json b/uml2es/examples/blockFactory/data/blockfactory/block/block163.json deleted file mode 100644 index 27d9c4e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block163.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block163", "length":3, "width":1, "height":2, "mass":0.3, "colorCode":"T2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block164.json b/uml2es/examples/blockFactory/data/blockfactory/block/block164.json deleted file mode 100644 index ca98ab7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block164.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block164", "length":1, "width":1, "height":5, "mass":0.25, "colorCode":"Y21", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block165.json b/uml2es/examples/blockFactory/data/blockfactory/block/block165.json deleted file mode 100644 index b179530..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block165.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block165", "length":2, "width":1, "height":5, "mass":2, "colorCode":"E18", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block166.json b/uml2es/examples/blockFactory/data/blockfactory/block/block166.json deleted file mode 100644 index 2e9c6b4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block166.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block166", "length":2, "width":2, "height":3, "mass":0.6, "colorCode":"BG49", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block167.json b/uml2es/examples/blockFactory/data/blockfactory/block/block167.json deleted file mode 100644 index 893b657..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block167.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block167", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"YG21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block168.json b/uml2es/examples/blockFactory/data/blockfactory/block/block168.json deleted file mode 100644 index 2ef8b05..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block168.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block168", "length":4, "width":4, "height":3, "mass":9.6, "colorCode":"YG25", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block169.json b/uml2es/examples/blockFactory/data/blockfactory/block/block169.json deleted file mode 100644 index dcecad1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block169.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block169", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"G94", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block17.json b/uml2es/examples/blockFactory/data/blockfactory/block/block17.json deleted file mode 100644 index d425865..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block17.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block17", "length":2, "width":5, "height":1, "mass":2, "colorCode":"B29", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block170.json b/uml2es/examples/blockFactory/data/blockfactory/block/block170.json deleted file mode 100644 index d14e3a9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block170.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block170", "length":5, "width":3, "height":3, "mass":9, "colorCode":"T5", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block171.json b/uml2es/examples/blockFactory/data/blockfactory/block/block171.json deleted file mode 100644 index ebc6a5a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block171.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block171", "length":1, "width":5, "height":4, "mass":1, "colorCode":"E09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block172.json b/uml2es/examples/blockFactory/data/blockfactory/block/block172.json deleted file mode 100644 index 2541f90..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block172.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block172", "length":5, "width":5, "height":4, "mass":5, "colorCode":"YR23", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block173.json b/uml2es/examples/blockFactory/data/blockfactory/block/block173.json deleted file mode 100644 index 2e02185..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block173.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block173", "length":3, "width":4, "height":4, "mass":9.6, "colorCode":"E84", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block174.json b/uml2es/examples/blockFactory/data/blockfactory/block/block174.json deleted file mode 100644 index a6c68e7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block174.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block174", "length":3, "width":3, "height":5, "mass":9, "colorCode":"V99", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block175.json b/uml2es/examples/blockFactory/data/blockfactory/block/block175.json deleted file mode 100644 index d4e03d1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block175.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block175", "length":1, "width":1, "height":3, "mass":0.15, "colorCode":"V93", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block176.json b/uml2es/examples/blockFactory/data/blockfactory/block/block176.json deleted file mode 100644 index 47d1c81..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block176.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block176", "length":5, "width":5, "height":2, "mass":10, "colorCode":"T3", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block177.json b/uml2es/examples/blockFactory/data/blockfactory/block/block177.json deleted file mode 100644 index 4958c82..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block177.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block177", "length":1, "width":1, "height":3, "mass":0.15, "colorCode":"R24", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block178.json b/uml2es/examples/blockFactory/data/blockfactory/block/block178.json deleted file mode 100644 index 38256d7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block178.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block178", "length":4, "width":2, "height":3, "mass":1.2, "colorCode":"B60", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block179.json b/uml2es/examples/blockFactory/data/blockfactory/block/block179.json deleted file mode 100644 index 8fc504d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block179.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block179", "length":4, "width":4, "height":5, "mass":4, "colorCode":"T6", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block18.json b/uml2es/examples/blockFactory/data/blockfactory/block/block18.json deleted file mode 100644 index 909b757..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block18.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block18", "length":5, "width":1, "height":3, "mass":3, "colorCode":"YR000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block180.json b/uml2es/examples/blockFactory/data/blockfactory/block/block180.json deleted file mode 100644 index 670be4e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block180.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block180", "length":4, "width":5, "height":1, "mass":4, "colorCode":"R59", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block181.json b/uml2es/examples/blockFactory/data/blockfactory/block/block181.json deleted file mode 100644 index f7d49f2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block181.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block181", "length":3, "width":3, "height":3, "mass":1.35, "colorCode":"G000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block182.json b/uml2es/examples/blockFactory/data/blockfactory/block/block182.json deleted file mode 100644 index 4edbeff..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block182.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block182", "length":1, "width":2, "height":4, "mass":0.4, "colorCode":"V01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block183.json b/uml2es/examples/blockFactory/data/blockfactory/block/block183.json deleted file mode 100644 index dce5646..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block183.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block183", "length":4, "width":4, "height":5, "mass":16, "colorCode":"W4", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block184.json b/uml2es/examples/blockFactory/data/blockfactory/block/block184.json deleted file mode 100644 index 18eba1b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block184.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block184", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"R59", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block185.json b/uml2es/examples/blockFactory/data/blockfactory/block/block185.json deleted file mode 100644 index 06f7e26..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block185.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block185", "length":3, "width":3, "height":5, "mass":2.25, "colorCode":"B45", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block186.json b/uml2es/examples/blockFactory/data/blockfactory/block/block186.json deleted file mode 100644 index 18f590f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block186.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block186", "length":2, "width":3, "height":3, "mass":3.6, "colorCode":"N2", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block187.json b/uml2es/examples/blockFactory/data/blockfactory/block/block187.json deleted file mode 100644 index 0c41403..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block187.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block187", "length":2, "width":4, "height":4, "mass":1.6, "colorCode":"BG02", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block188.json b/uml2es/examples/blockFactory/data/blockfactory/block/block188.json deleted file mode 100644 index 7274aba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block188.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block188", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"BG93", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block189.json b/uml2es/examples/blockFactory/data/blockfactory/block/block189.json deleted file mode 100644 index c2e84d4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block189.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block189", "length":1, "width":5, "height":2, "mass":2, "colorCode":"N0", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block19.json b/uml2es/examples/blockFactory/data/blockfactory/block/block19.json deleted file mode 100644 index 7f99bb7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block19.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block19", "length":3, "width":5, "height":1, "mass":3, "colorCode":"YR61", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block190.json b/uml2es/examples/blockFactory/data/blockfactory/block/block190.json deleted file mode 100644 index 9526ac0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block190.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block190", "length":5, "width":2, "height":4, "mass":8, "colorCode":"FYG1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block191.json b/uml2es/examples/blockFactory/data/blockfactory/block/block191.json deleted file mode 100644 index 7d3c550..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block191.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block191", "length":1, "width":1, "height":2, "mass":0.1, "colorCode":"R81", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block192.json b/uml2es/examples/blockFactory/data/blockfactory/block/block192.json deleted file mode 100644 index 0815783..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block192.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block192", "length":2, "width":4, "height":3, "mass":4.8, "colorCode":"E09", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block193.json b/uml2es/examples/blockFactory/data/blockfactory/block/block193.json deleted file mode 100644 index d533e2d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block193.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block193", "length":5, "width":4, "height":4, "mass":16, "colorCode":"E57", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block194.json b/uml2es/examples/blockFactory/data/blockfactory/block/block194.json deleted file mode 100644 index 6636f22..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block194.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block194", "length":4, "width":4, "height":3, "mass":2.4, "colorCode":"BG05", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block195.json b/uml2es/examples/blockFactory/data/blockfactory/block/block195.json deleted file mode 100644 index a8129ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block195.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block195", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"YG67", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block196.json b/uml2es/examples/blockFactory/data/blockfactory/block/block196.json deleted file mode 100644 index a7c29e1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block196.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block196", "length":3, "width":5, "height":1, "mass":0.75, "colorCode":"YG91", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block197.json b/uml2es/examples/blockFactory/data/blockfactory/block/block197.json deleted file mode 100644 index 46dc93b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block197.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block197", "length":1, "width":3, "height":3, "mass":0.45, "colorCode":"V04", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block198.json b/uml2es/examples/blockFactory/data/blockfactory/block/block198.json deleted file mode 100644 index 7184e8c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block198.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block198", "length":3, "width":4, "height":4, "mass":9.6, "colorCode":"R20", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block199.json b/uml2es/examples/blockFactory/data/blockfactory/block/block199.json deleted file mode 100644 index 3acf028..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block199.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block199", "length":1, "width":4, "height":1, "mass":0.8, "colorCode":"YR31", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block2.json b/uml2es/examples/blockFactory/data/blockfactory/block/block2.json deleted file mode 100644 index d2b515c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block2.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block2", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"YR82", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block20.json b/uml2es/examples/blockFactory/data/blockfactory/block/block20.json deleted file mode 100644 index e14e98b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block20.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block20", "length":2, "width":1, "height":4, "mass":1.6, "colorCode":"Y0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block200.json b/uml2es/examples/blockFactory/data/blockfactory/block/block200.json deleted file mode 100644 index 5c2fe3d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block200.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block200", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"T6", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block201.json b/uml2es/examples/blockFactory/data/blockfactory/block/block201.json deleted file mode 100644 index 61f69ea..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block201.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block201", "length":5, "width":4, "height":1, "mass":4, "colorCode":"T10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block202.json b/uml2es/examples/blockFactory/data/blockfactory/block/block202.json deleted file mode 100644 index e3e36a1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block202.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block202", "length":2, "width":2, "height":3, "mass":2.4, "colorCode":"B91", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block203.json b/uml2es/examples/blockFactory/data/blockfactory/block/block203.json deleted file mode 100644 index 5f81a87..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block203.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block203", "length":2, "width":4, "height":5, "mass":8, "colorCode":"YG67", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block204.json b/uml2es/examples/blockFactory/data/blockfactory/block/block204.json deleted file mode 100644 index 974e165..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block204.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block204", "length":5, "width":5, "height":2, "mass":2.5, "colorCode":"E31", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block205.json b/uml2es/examples/blockFactory/data/blockfactory/block/block205.json deleted file mode 100644 index 387e024..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block205.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block205", "length":5, "width":1, "height":4, "mass":4, "colorCode":"W1", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block206.json b/uml2es/examples/blockFactory/data/blockfactory/block/block206.json deleted file mode 100644 index 3c9b0c1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block206.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block206", "length":2, "width":5, "height":3, "mass":6, "colorCode":"G000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block207.json b/uml2es/examples/blockFactory/data/blockfactory/block/block207.json deleted file mode 100644 index bec90a9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block207.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block207", "length":1, "width":1, "height":2, "mass":0.4, "colorCode":"C3", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block208.json b/uml2es/examples/blockFactory/data/blockfactory/block/block208.json deleted file mode 100644 index 65de4e1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block208.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block208", "length":2, "width":1, "height":2, "mass":0.2, "colorCode":"B99", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block209.json b/uml2es/examples/blockFactory/data/blockfactory/block/block209.json deleted file mode 100644 index 30d88b0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block209.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block209", "length":5, "width":2, "height":1, "mass":2, "colorCode":"B23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block21.json b/uml2es/examples/blockFactory/data/blockfactory/block/block21.json deleted file mode 100644 index e8418fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block21.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block21", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"B0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block210.json b/uml2es/examples/blockFactory/data/blockfactory/block/block210.json deleted file mode 100644 index 039a977..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block210.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block210", "length":3, "width":5, "height":1, "mass":3, "colorCode":"T10", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block211.json b/uml2es/examples/blockFactory/data/blockfactory/block/block211.json deleted file mode 100644 index 8b196ea..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block211.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block211", "length":3, "width":2, "height":2, "mass":2.4, "colorCode":"YG97", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block212.json b/uml2es/examples/blockFactory/data/blockfactory/block/block212.json deleted file mode 100644 index a762a32..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block212.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block212", "length":2, "width":4, "height":5, "mass":8, "colorCode":"YG93", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block213.json b/uml2es/examples/blockFactory/data/blockfactory/block/block213.json deleted file mode 100644 index cdb6afc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block213.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block213", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"E59", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block214.json b/uml2es/examples/blockFactory/data/blockfactory/block/block214.json deleted file mode 100644 index 2f44b0e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block214.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block214", "length":2, "width":4, "height":2, "mass":0.8, "colorCode":"Y38", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block215.json b/uml2es/examples/blockFactory/data/blockfactory/block/block215.json deleted file mode 100644 index 7fa3a72..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block215.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block215", "length":2, "width":5, "height":5, "mass":10, "colorCode":"R46", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block216.json b/uml2es/examples/blockFactory/data/blockfactory/block/block216.json deleted file mode 100644 index 7ab59e1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block216.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block216", "length":3, "width":4, "height":5, "mass":12, "colorCode":"G17", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block217.json b/uml2es/examples/blockFactory/data/blockfactory/block/block217.json deleted file mode 100644 index 9f63e54..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block217.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block217", "length":4, "width":1, "height":5, "mass":4, "colorCode":"G00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block218.json b/uml2es/examples/blockFactory/data/blockfactory/block/block218.json deleted file mode 100644 index 46237a1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block218.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block218", "length":1, "width":3, "height":3, "mass":1.8, "colorCode":"BG72", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block219.json b/uml2es/examples/blockFactory/data/blockfactory/block/block219.json deleted file mode 100644 index 39743fa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block219.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block219", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"RV14", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block22.json b/uml2es/examples/blockFactory/data/blockfactory/block/block22.json deleted file mode 100644 index 678e712..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block22.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block22", "length":5, "width":2, "height":1, "mass":2, "colorCode":"YR07", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block220.json b/uml2es/examples/blockFactory/data/blockfactory/block/block220.json deleted file mode 100644 index 5c429d7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block220.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block220", "length":2, "width":4, "height":5, "mass":8, "colorCode":"G20", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block221.json b/uml2es/examples/blockFactory/data/blockfactory/block/block221.json deleted file mode 100644 index 9aec601..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block221.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block221", "length":2, "width":2, "height":5, "mass":4, "colorCode":"B16", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block222.json b/uml2es/examples/blockFactory/data/blockfactory/block/block222.json deleted file mode 100644 index 921e35a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block222.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block222", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"RV32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block223.json b/uml2es/examples/blockFactory/data/blockfactory/block/block223.json deleted file mode 100644 index 9193047..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block223.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block223", "length":3, "width":3, "height":5, "mass":9, "colorCode":"Y11", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block224.json b/uml2es/examples/blockFactory/data/blockfactory/block/block224.json deleted file mode 100644 index 0283d7c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block224.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block224", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"YG06", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block225.json b/uml2es/examples/blockFactory/data/blockfactory/block/block225.json deleted file mode 100644 index cf9c53b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block225.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block225", "length":2, "width":2, "height":1, "mass":0.8, "colorCode":"R29", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block226.json b/uml2es/examples/blockFactory/data/blockfactory/block/block226.json deleted file mode 100644 index e6f5066..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block226.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block226", "length":1, "width":5, "height":1, "mass":1, "colorCode":"RV10", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block227.json b/uml2es/examples/blockFactory/data/blockfactory/block/block227.json deleted file mode 100644 index d17ac7a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block227.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block227", "length":1, "width":3, "height":3, "mass":1.8, "colorCode":"BG53", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block228.json b/uml2es/examples/blockFactory/data/blockfactory/block/block228.json deleted file mode 100644 index ed7722c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block228.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block228", "length":4, "width":4, "height":4, "mass":12.8, "colorCode":"RV52", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block229.json b/uml2es/examples/blockFactory/data/blockfactory/block/block229.json deleted file mode 100644 index c4fcf91..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block229.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block229", "length":5, "width":3, "height":2, "mass":6, "colorCode":"YR31", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block23.json b/uml2es/examples/blockFactory/data/blockfactory/block/block23.json deleted file mode 100644 index be2abec..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block23.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block23", "length":5, "width":2, "height":4, "mass":8, "colorCode":"T10", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block230.json b/uml2es/examples/blockFactory/data/blockfactory/block/block230.json deleted file mode 100644 index 044ad8c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block230.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block230", "length":1, "width":5, "height":5, "mass":1.25, "colorCode":"BG57", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block231.json b/uml2es/examples/blockFactory/data/blockfactory/block/block231.json deleted file mode 100644 index 1871195..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block231.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block231", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"V05", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block232.json b/uml2es/examples/blockFactory/data/blockfactory/block/block232.json deleted file mode 100644 index 3dda8dd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block232.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block232", "length":1, "width":2, "height":4, "mass":0.4, "colorCode":"Y06", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block233.json b/uml2es/examples/blockFactory/data/blockfactory/block/block233.json deleted file mode 100644 index 423d7e4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block233.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block233", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"G28", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block234.json b/uml2es/examples/blockFactory/data/blockfactory/block/block234.json deleted file mode 100644 index ac2d0d9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block234.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block234", "length":3, "width":3, "height":4, "mass":7.2, "colorCode":"N0", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block235.json b/uml2es/examples/blockFactory/data/blockfactory/block/block235.json deleted file mode 100644 index 6ab7316..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block235.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block235", "length":3, "width":2, "height":1, "mass":1.2, "colorCode":"BG32", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block236.json b/uml2es/examples/blockFactory/data/blockfactory/block/block236.json deleted file mode 100644 index 880b5b7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block236.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block236", "length":5, "width":2, "height":4, "mass":8, "colorCode":"E17", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block237.json b/uml2es/examples/blockFactory/data/blockfactory/block/block237.json deleted file mode 100644 index a3ca329..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block237.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block237", "length":2, "width":5, "height":1, "mass":0.5, "colorCode":"W3", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block238.json b/uml2es/examples/blockFactory/data/blockfactory/block/block238.json deleted file mode 100644 index 12a5700..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block238.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block238", "length":4, "width":3, "height":3, "mass":7.2, "colorCode":"YG67", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block239.json b/uml2es/examples/blockFactory/data/blockfactory/block/block239.json deleted file mode 100644 index ba5ffaa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block239.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block239", "length":3, "width":5, "height":4, "mass":12, "colorCode":"R27", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block24.json b/uml2es/examples/blockFactory/data/blockfactory/block/block24.json deleted file mode 100644 index 4551b51..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block24.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block24", "length":4, "width":5, "height":1, "mass":4, "colorCode":"C10", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block240.json b/uml2es/examples/blockFactory/data/blockfactory/block/block240.json deleted file mode 100644 index 1a92ca2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block240.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block240", "length":5, "width":3, "height":1, "mass":3, "colorCode":"BV29", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block241.json b/uml2es/examples/blockFactory/data/blockfactory/block/block241.json deleted file mode 100644 index 8f2470a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block241.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block241", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"R11", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block242.json b/uml2es/examples/blockFactory/data/blockfactory/block/block242.json deleted file mode 100644 index 9f71fb3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block242.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block242", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"G40", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block243.json b/uml2es/examples/blockFactory/data/blockfactory/block/block243.json deleted file mode 100644 index 86421cd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block243.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block243", "length":3, "width":4, "height":4, "mass":2.4, "colorCode":"BV25", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block244.json b/uml2es/examples/blockFactory/data/blockfactory/block/block244.json deleted file mode 100644 index fade777..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block244.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block244", "length":5, "width":1, "height":2, "mass":2, "colorCode":"R85", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block245.json b/uml2es/examples/blockFactory/data/blockfactory/block/block245.json deleted file mode 100644 index 4b47cac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block245.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block245", "length":2, "width":2, "height":5, "mass":1, "colorCode":"G99", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block246.json b/uml2es/examples/blockFactory/data/blockfactory/block/block246.json deleted file mode 100644 index 4d09437..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block246.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block246", "length":1, "width":2, "height":4, "mass":1.6, "colorCode":"V01", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block247.json b/uml2es/examples/blockFactory/data/blockfactory/block/block247.json deleted file mode 100644 index 1ff6177..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block247.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block247", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"Y15", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block248.json b/uml2es/examples/blockFactory/data/blockfactory/block/block248.json deleted file mode 100644 index 2983fea..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block248.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block248", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"Y38", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block249.json b/uml2es/examples/blockFactory/data/blockfactory/block/block249.json deleted file mode 100644 index 4e15a3f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block249.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block249", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"T10", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block25.json b/uml2es/examples/blockFactory/data/blockfactory/block/block25.json deleted file mode 100644 index d16812b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block25.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block25", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"W8", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block250.json b/uml2es/examples/blockFactory/data/blockfactory/block/block250.json deleted file mode 100644 index 07d2330..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block250.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block250", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"W2", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block251.json b/uml2es/examples/blockFactory/data/blockfactory/block/block251.json deleted file mode 100644 index 49aafe4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block251.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block251", "length":5, "width":3, "height":3, "mass":2.25, "colorCode":"RV29", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block252.json b/uml2es/examples/blockFactory/data/blockfactory/block/block252.json deleted file mode 100644 index cb45a0c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block252.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block252", "length":5, "width":4, "height":4, "mass":4, "colorCode":"R02", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block253.json b/uml2es/examples/blockFactory/data/blockfactory/block/block253.json deleted file mode 100644 index 51e0c49..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block253.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block253", "length":4, "width":5, "height":3, "mass":3, "colorCode":"R01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block254.json b/uml2es/examples/blockFactory/data/blockfactory/block/block254.json deleted file mode 100644 index 7fa0007..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block254.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block254", "length":5, "width":2, "height":1, "mass":2, "colorCode":"BG10", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block255.json b/uml2es/examples/blockFactory/data/blockfactory/block/block255.json deleted file mode 100644 index 882d0d5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block255.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block255", "length":3, "width":2, "height":4, "mass":4.8, "colorCode":"E17", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block256.json b/uml2es/examples/blockFactory/data/blockfactory/block/block256.json deleted file mode 100644 index be170f9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block256.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block256", "length":4, "width":4, "height":2, "mass":1.6, "colorCode":"V22", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block257.json b/uml2es/examples/blockFactory/data/blockfactory/block/block257.json deleted file mode 100644 index ac59f72..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block257.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block257", "length":1, "width":1, "height":4, "mass":0.8, "colorCode":"G03", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block258.json b/uml2es/examples/blockFactory/data/blockfactory/block/block258.json deleted file mode 100644 index 47ef9b3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block258.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block258", "length":4, "width":3, "height":5, "mass":12, "colorCode":"B93", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block259.json b/uml2es/examples/blockFactory/data/blockfactory/block/block259.json deleted file mode 100644 index 616bd37..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block259.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block259", "length":5, "width":1, "height":1, "mass":1, "colorCode":"BG72", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block26.json b/uml2es/examples/blockFactory/data/blockfactory/block/block26.json deleted file mode 100644 index 602b460..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block26.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block26", "length":2, "width":3, "height":2, "mass":2.4, "colorCode":"R46", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block260.json b/uml2es/examples/blockFactory/data/blockfactory/block/block260.json deleted file mode 100644 index 051d859..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block260.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block260", "length":2, "width":3, "height":1, "mass":0.3, "colorCode":"BG90", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block261.json b/uml2es/examples/blockFactory/data/blockfactory/block/block261.json deleted file mode 100644 index cc44922..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block261.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block261", "length":4, "width":3, "height":1, "mass":2.4, "colorCode":"BG01", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block262.json b/uml2es/examples/blockFactory/data/blockfactory/block/block262.json deleted file mode 100644 index 9828e75..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block262.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block262", "length":2, "width":1, "height":5, "mass":2, "colorCode":"T9", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block263.json b/uml2es/examples/blockFactory/data/blockfactory/block/block263.json deleted file mode 100644 index 6876a56..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block263.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block263", "length":1, "width":4, "height":4, "mass":3.2, "colorCode":"YR61", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block264.json b/uml2es/examples/blockFactory/data/blockfactory/block/block264.json deleted file mode 100644 index 1a2339c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block264.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block264", "length":3, "width":5, "height":5, "mass":15, "colorCode":"YG61", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block265.json b/uml2es/examples/blockFactory/data/blockfactory/block/block265.json deleted file mode 100644 index faeb08d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block265.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block265", "length":4, "width":1, "height":4, "mass":0.8, "colorCode":"V0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block266.json b/uml2es/examples/blockFactory/data/blockfactory/block/block266.json deleted file mode 100644 index 16e9135..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block266.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block266", "length":3, "width":1, "height":5, "mass":0.75, "colorCode":"E00", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block267.json b/uml2es/examples/blockFactory/data/blockfactory/block/block267.json deleted file mode 100644 index 101d5d2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block267.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block267", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"E71", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block268.json b/uml2es/examples/blockFactory/data/blockfactory/block/block268.json deleted file mode 100644 index 48ac32e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block268.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block268", "length":4, "width":2, "height":4, "mass":1.6, "colorCode":"R37", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block269.json b/uml2es/examples/blockFactory/data/blockfactory/block/block269.json deleted file mode 100644 index 3d681a2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block269.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block269", "length":5, "width":2, "height":2, "mass":4, "colorCode":"E15", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block27.json b/uml2es/examples/blockFactory/data/blockfactory/block/block27.json deleted file mode 100644 index 3fbb013..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block27.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block27", "length":3, "width":4, "height":1, "mass":0.6, "colorCode":"C8", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block270.json b/uml2es/examples/blockFactory/data/blockfactory/block/block270.json deleted file mode 100644 index 6b0cb0f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block270.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block270", "length":3, "width":4, "height":2, "mass":4.8, "colorCode":"YG07", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block271.json b/uml2es/examples/blockFactory/data/blockfactory/block/block271.json deleted file mode 100644 index 54cdbff..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block271.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block271", "length":1, "width":4, "height":3, "mass":2.4, "colorCode":"E02", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block272.json b/uml2es/examples/blockFactory/data/blockfactory/block/block272.json deleted file mode 100644 index badaee3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block272.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block272", "length":1, "width":3, "height":5, "mass":3, "colorCode":"V91", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block273.json b/uml2es/examples/blockFactory/data/blockfactory/block/block273.json deleted file mode 100644 index 073a3e6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block273.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block273", "length":5, "width":5, "height":2, "mass":10, "colorCode":"RV14", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block274.json b/uml2es/examples/blockFactory/data/blockfactory/block/block274.json deleted file mode 100644 index 339206f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block274.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block274", "length":4, "width":4, "height":5, "mass":16, "colorCode":"YR21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block275.json b/uml2es/examples/blockFactory/data/blockfactory/block/block275.json deleted file mode 100644 index c56487d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block275.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block275", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"T1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block276.json b/uml2es/examples/blockFactory/data/blockfactory/block/block276.json deleted file mode 100644 index 6255373..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block276.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block276", "length":5, "width":3, "height":4, "mass":12, "colorCode":"RV42", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block277.json b/uml2es/examples/blockFactory/data/blockfactory/block/block277.json deleted file mode 100644 index 67d2148..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block277.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block277", "length":4, "width":4, "height":5, "mass":16, "colorCode":"V0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block278.json b/uml2es/examples/blockFactory/data/blockfactory/block/block278.json deleted file mode 100644 index 9a5c150..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block278.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block278", "length":5, "width":4, "height":1, "mass":4, "colorCode":"G19", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block279.json b/uml2es/examples/blockFactory/data/blockfactory/block/block279.json deleted file mode 100644 index d98aed8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block279.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block279", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"B05", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block28.json b/uml2es/examples/blockFactory/data/blockfactory/block/block28.json deleted file mode 100644 index e8c0ed7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block28.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block28", "length":1, "width":3, "height":1, "mass":0.6, "colorCode":"E47", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block280.json b/uml2es/examples/blockFactory/data/blockfactory/block/block280.json deleted file mode 100644 index 5fd1bf9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block280.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block280", "length":1, "width":1, "height":2, "mass":0.1, "colorCode":"T4", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block281.json b/uml2es/examples/blockFactory/data/blockfactory/block/block281.json deleted file mode 100644 index ca24d38..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block281.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block281", "length":4, "width":4, "height":5, "mass":4, "colorCode":"BG05", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block282.json b/uml2es/examples/blockFactory/data/blockfactory/block/block282.json deleted file mode 100644 index 7f74be8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block282.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block282", "length":4, "width":5, "height":4, "mass":4, "colorCode":"R83", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block283.json b/uml2es/examples/blockFactory/data/blockfactory/block/block283.json deleted file mode 100644 index c3549c8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block283.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block283", "length":4, "width":5, "height":1, "mass":1, "colorCode":"B04", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block284.json b/uml2es/examples/blockFactory/data/blockfactory/block/block284.json deleted file mode 100644 index ee03886..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block284.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block284", "length":2, "width":5, "height":4, "mass":8, "colorCode":"T9", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block285.json b/uml2es/examples/blockFactory/data/blockfactory/block/block285.json deleted file mode 100644 index 216ccf1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block285.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block285", "length":3, "width":2, "height":1, "mass":1.2, "colorCode":"E19", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block286.json b/uml2es/examples/blockFactory/data/blockfactory/block/block286.json deleted file mode 100644 index e056e5d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block286.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block286", "length":2, "width":3, "height":1, "mass":1.2, "colorCode":"E18", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block287.json b/uml2es/examples/blockFactory/data/blockfactory/block/block287.json deleted file mode 100644 index 7c49d5e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block287.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block287", "length":3, "width":1, "height":3, "mass":0.45, "colorCode":"BG13", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block288.json b/uml2es/examples/blockFactory/data/blockfactory/block/block288.json deleted file mode 100644 index 155b174..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block288.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block288", "length":1, "width":5, "height":1, "mass":0.25, "colorCode":"B18", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block289.json b/uml2es/examples/blockFactory/data/blockfactory/block/block289.json deleted file mode 100644 index 593a05f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block289.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block289", "length":3, "width":2, "height":3, "mass":3.6, "colorCode":"E99", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block29.json b/uml2es/examples/blockFactory/data/blockfactory/block/block29.json deleted file mode 100644 index 1251f1f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block29.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block29", "length":2, "width":5, "height":4, "mass":8, "colorCode":"Y02", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block290.json b/uml2es/examples/blockFactory/data/blockfactory/block/block290.json deleted file mode 100644 index c8c555f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block290.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block290", "length":1, "width":1, "height":2, "mass":0.4, "colorCode":"Y000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block291.json b/uml2es/examples/blockFactory/data/blockfactory/block/block291.json deleted file mode 100644 index 2d8c4ff..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block291.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block291", "length":1, "width":1, "height":4, "mass":0.8, "colorCode":"E97", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block292.json b/uml2es/examples/blockFactory/data/blockfactory/block/block292.json deleted file mode 100644 index ab6205e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block292.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block292", "length":5, "width":2, "height":4, "mass":8, "colorCode":"W9", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block293.json b/uml2es/examples/blockFactory/data/blockfactory/block/block293.json deleted file mode 100644 index cdbc012..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block293.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block293", "length":5, "width":4, "height":3, "mass":12, "colorCode":"YR07", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block294.json b/uml2es/examples/blockFactory/data/blockfactory/block/block294.json deleted file mode 100644 index 5106030..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block294.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block294", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"RV19", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block295.json b/uml2es/examples/blockFactory/data/blockfactory/block/block295.json deleted file mode 100644 index 5ac99ae..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block295.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block295", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"B37", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block296.json b/uml2es/examples/blockFactory/data/blockfactory/block/block296.json deleted file mode 100644 index a6e3c76..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block296.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block296", "length":5, "width":5, "height":3, "mass":15, "colorCode":"RV69", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block297.json b/uml2es/examples/blockFactory/data/blockfactory/block/block297.json deleted file mode 100644 index 99691f7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block297.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block297", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"C9", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block298.json b/uml2es/examples/blockFactory/data/blockfactory/block/block298.json deleted file mode 100644 index 4833036..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block298.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block298", "length":1, "width":4, "height":3, "mass":2.4, "colorCode":"R08", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block299.json b/uml2es/examples/blockFactory/data/blockfactory/block/block299.json deleted file mode 100644 index a7ea06c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block299.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block299", "length":3, "width":2, "height":5, "mass":1.5, "colorCode":"E93", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block3.json b/uml2es/examples/blockFactory/data/blockfactory/block/block3.json deleted file mode 100644 index 7c6eb69..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block3.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block3", "length":2, "width":5, "height":4, "mass":8, "colorCode":"BG09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block30.json b/uml2es/examples/blockFactory/data/blockfactory/block/block30.json deleted file mode 100644 index c4c7558..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block30.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block30", "length":1, "width":1, "height":3, "mass":0.6, "colorCode":"BV11", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block300.json b/uml2es/examples/blockFactory/data/blockfactory/block/block300.json deleted file mode 100644 index 2734d47..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block300.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block300", "length":1, "width":1, "height":4, "mass":0.8, "colorCode":"T5", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block301.json b/uml2es/examples/blockFactory/data/blockfactory/block/block301.json deleted file mode 100644 index 87a9efb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block301.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block301", "length":3, "width":5, "height":5, "mass":15, "colorCode":"R35", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block302.json b/uml2es/examples/blockFactory/data/blockfactory/block/block302.json deleted file mode 100644 index df42ee8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block302.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block302", "length":4, "width":4, "height":2, "mass":1.6, "colorCode":"E27", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block303.json b/uml2es/examples/blockFactory/data/blockfactory/block/block303.json deleted file mode 100644 index d74b985..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block303.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block303", "length":3, "width":2, "height":3, "mass":3.6, "colorCode":"E74", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block304.json b/uml2es/examples/blockFactory/data/blockfactory/block/block304.json deleted file mode 100644 index ef1c9ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block304.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block304", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"G99", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block305.json b/uml2es/examples/blockFactory/data/blockfactory/block/block305.json deleted file mode 100644 index e5a2ca7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block305.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block305", "length":2, "width":3, "height":5, "mass":6, "colorCode":"G14", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block306.json b/uml2es/examples/blockFactory/data/blockfactory/block/block306.json deleted file mode 100644 index c1b51e0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block306.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block306", "length":2, "width":4, "height":5, "mass":2, "colorCode":"RV09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block307.json b/uml2es/examples/blockFactory/data/blockfactory/block/block307.json deleted file mode 100644 index 4b26dbd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block307.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block307", "length":1, "width":1, "height":5, "mass":1, "colorCode":"YR82", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block308.json b/uml2es/examples/blockFactory/data/blockfactory/block/block308.json deleted file mode 100644 index bc4dd2f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block308.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block308", "length":5, "width":3, "height":5, "mass":15, "colorCode":"RV06", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block309.json b/uml2es/examples/blockFactory/data/blockfactory/block/block309.json deleted file mode 100644 index f53c0d3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block309.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block309", "length":1, "width":4, "height":2, "mass":1.6, "colorCode":"BV31", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block31.json b/uml2es/examples/blockFactory/data/blockfactory/block/block31.json deleted file mode 100644 index 955cfee..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block31.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block31", "length":4, "width":3, "height":5, "mass":12, "colorCode":"YG25", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block310.json b/uml2es/examples/blockFactory/data/blockfactory/block/block310.json deleted file mode 100644 index 9e23308..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block310.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block310", "length":1, "width":5, "height":1, "mass":1, "colorCode":"N7", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block311.json b/uml2es/examples/blockFactory/data/blockfactory/block/block311.json deleted file mode 100644 index 11dbb30..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block311.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block311", "length":3, "width":2, "height":4, "mass":1.2, "colorCode":"YG95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block312.json b/uml2es/examples/blockFactory/data/blockfactory/block/block312.json deleted file mode 100644 index de7d358..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block312.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block312", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"Y18", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block313.json b/uml2es/examples/blockFactory/data/blockfactory/block/block313.json deleted file mode 100644 index cab3976..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block313.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block313", "length":1, "width":4, "height":4, "mass":3.2, "colorCode":"B16", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block314.json b/uml2es/examples/blockFactory/data/blockfactory/block/block314.json deleted file mode 100644 index ebf84c6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block314.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block314", "length":4, "width":4, "height":3, "mass":9.6, "colorCode":"E95", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block315.json b/uml2es/examples/blockFactory/data/blockfactory/block/block315.json deleted file mode 100644 index 3a6636a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block315.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block315", "length":2, "width":2, "height":5, "mass":1, "colorCode":"W10", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block316.json b/uml2es/examples/blockFactory/data/blockfactory/block/block316.json deleted file mode 100644 index 5a46744..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block316.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block316", "length":5, "width":4, "height":4, "mass":16, "colorCode":"B39", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block317.json b/uml2es/examples/blockFactory/data/blockfactory/block/block317.json deleted file mode 100644 index f593b70..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block317.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block317", "length":5, "width":1, "height":2, "mass":2, "colorCode":"BG09", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block318.json b/uml2es/examples/blockFactory/data/blockfactory/block/block318.json deleted file mode 100644 index e2cfea5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block318.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block318", "length":2, "width":5, "height":2, "mass":1, "colorCode":"Y23", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block319.json b/uml2es/examples/blockFactory/data/blockfactory/block/block319.json deleted file mode 100644 index 70c0c48..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block319.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block319", "length":1, "width":1, "height":1, "mass":0.2, "colorCode":"E25", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block32.json b/uml2es/examples/blockFactory/data/blockfactory/block/block32.json deleted file mode 100644 index 194d10b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block32.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block32", "length":2, "width":2, "height":3, "mass":2.4, "colorCode":"YG0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block320.json b/uml2es/examples/blockFactory/data/blockfactory/block/block320.json deleted file mode 100644 index 366f46a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block320.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block320", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"RV00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block321.json b/uml2es/examples/blockFactory/data/blockfactory/block/block321.json deleted file mode 100644 index 364b18a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block321.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block321", "length":5, "width":4, "height":1, "mass":4, "colorCode":"Y08", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block322.json b/uml2es/examples/blockFactory/data/blockfactory/block/block322.json deleted file mode 100644 index b295d2a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block322.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block322", "length":3, "width":4, "height":4, "mass":9.6, "colorCode":"Y06", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block323.json b/uml2es/examples/blockFactory/data/blockfactory/block/block323.json deleted file mode 100644 index 8a7c672..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block323.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block323", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"RV00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block324.json b/uml2es/examples/blockFactory/data/blockfactory/block/block324.json deleted file mode 100644 index 6f53a8e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block324.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block324", "length":3, "width":2, "height":5, "mass":6, "colorCode":"RV000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block325.json b/uml2es/examples/blockFactory/data/blockfactory/block/block325.json deleted file mode 100644 index 52f8fbd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block325.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block325", "length":1, "width":3, "height":4, "mass":0.6, "colorCode":"V20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block326.json b/uml2es/examples/blockFactory/data/blockfactory/block/block326.json deleted file mode 100644 index 115dcb3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block326.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block326", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"YR21", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block327.json b/uml2es/examples/blockFactory/data/blockfactory/block/block327.json deleted file mode 100644 index 714ffa9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block327.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block327", "length":2, "width":3, "height":3, "mass":3.6, "colorCode":"W7", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block328.json b/uml2es/examples/blockFactory/data/blockfactory/block/block328.json deleted file mode 100644 index 1155149..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block328.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block328", "length":5, "width":3, "height":1, "mass":3, "colorCode":"G09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block329.json b/uml2es/examples/blockFactory/data/blockfactory/block/block329.json deleted file mode 100644 index 444063e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block329.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block329", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"E77", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block33.json b/uml2es/examples/blockFactory/data/blockfactory/block/block33.json deleted file mode 100644 index 9c1f23c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block33.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block33", "length":4, "width":3, "height":5, "mass":12, "colorCode":"E70", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block330.json b/uml2es/examples/blockFactory/data/blockfactory/block/block330.json deleted file mode 100644 index 13e5796..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block330.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block330", "length":3, "width":2, "height":5, "mass":6, "colorCode":"YG06", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block331.json b/uml2es/examples/blockFactory/data/blockfactory/block/block331.json deleted file mode 100644 index e73b6f6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block331.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block331", "length":4, "width":4, "height":4, "mass":12.8, "colorCode":"BV11", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block332.json b/uml2es/examples/blockFactory/data/blockfactory/block/block332.json deleted file mode 100644 index 93f21fa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block332.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block332", "length":1, "width":1, "height":3, "mass":0.6, "colorCode":"B97", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block333.json b/uml2es/examples/blockFactory/data/blockfactory/block/block333.json deleted file mode 100644 index ad0986b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block333.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block333", "length":3, "width":2, "height":2, "mass":2.4, "colorCode":"YG09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block334.json b/uml2es/examples/blockFactory/data/blockfactory/block/block334.json deleted file mode 100644 index ca69199..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block334.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block334", "length":4, "width":5, "height":2, "mass":8, "colorCode":"B28", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block335.json b/uml2es/examples/blockFactory/data/blockfactory/block/block335.json deleted file mode 100644 index e8a8057..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block335.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block335", "length":2, "width":4, "height":5, "mass":8, "colorCode":"YR68", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block336.json b/uml2es/examples/blockFactory/data/blockfactory/block/block336.json deleted file mode 100644 index 6da7bef..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block336.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block336", "length":5, "width":4, "height":5, "mass":20, "colorCode":"C9", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block337.json b/uml2es/examples/blockFactory/data/blockfactory/block/block337.json deleted file mode 100644 index b25f910..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block337.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block337", "length":5, "width":4, "height":5, "mass":20, "colorCode":"E89", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block338.json b/uml2es/examples/blockFactory/data/blockfactory/block/block338.json deleted file mode 100644 index 1b7f701..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block338.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block338", "length":1, "width":1, "height":5, "mass":1, "colorCode":"B18", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block339.json b/uml2es/examples/blockFactory/data/blockfactory/block/block339.json deleted file mode 100644 index 9988efa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block339.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block339", "length":1, "width":1, "height":3, "mass":0.15, "colorCode":"R00", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block34.json b/uml2es/examples/blockFactory/data/blockfactory/block/block34.json deleted file mode 100644 index d2a5c8f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block34.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block34", "length":5, "width":4, "height":2, "mass":8, "colorCode":"BG49", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block340.json b/uml2es/examples/blockFactory/data/blockfactory/block/block340.json deleted file mode 100644 index 9969b14..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block340.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block340", "length":5, "width":4, "height":3, "mass":12, "colorCode":"E74", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block341.json b/uml2es/examples/blockFactory/data/blockfactory/block/block341.json deleted file mode 100644 index 64931a7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block341.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block341", "length":2, "width":2, "height":4, "mass":3.2, "colorCode":"B02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block342.json b/uml2es/examples/blockFactory/data/blockfactory/block/block342.json deleted file mode 100644 index be50338..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block342.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block342", "length":2, "width":5, "height":3, "mass":1.5, "colorCode":"BG53", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block343.json b/uml2es/examples/blockFactory/data/blockfactory/block/block343.json deleted file mode 100644 index e911e42..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block343.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block343", "length":5, "width":1, "height":3, "mass":3, "colorCode":"C0", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block344.json b/uml2es/examples/blockFactory/data/blockfactory/block/block344.json deleted file mode 100644 index ef6da5f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block344.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block344", "length":3, "width":3, "height":4, "mass":1.8, "colorCode":"E08", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block345.json b/uml2es/examples/blockFactory/data/blockfactory/block/block345.json deleted file mode 100644 index c8eda8b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block345.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block345", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"E57", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block346.json b/uml2es/examples/blockFactory/data/blockfactory/block/block346.json deleted file mode 100644 index 7aa2471..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block346.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block346", "length":5, "width":3, "height":1, "mass":0.75, "colorCode":"YR01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block347.json b/uml2es/examples/blockFactory/data/blockfactory/block/block347.json deleted file mode 100644 index cf75d2c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block347.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block347", "length":2, "width":1, "height":4, "mass":1.6, "colorCode":"YG99", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block348.json b/uml2es/examples/blockFactory/data/blockfactory/block/block348.json deleted file mode 100644 index 6907d98..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block348.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block348", "length":2, "width":5, "height":3, "mass":6, "colorCode":"V17", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block349.json b/uml2es/examples/blockFactory/data/blockfactory/block/block349.json deleted file mode 100644 index 32517e1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block349.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block349", "length":5, "width":5, "height":5, "mass":25, "colorCode":"0", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block35.json b/uml2es/examples/blockFactory/data/blockfactory/block/block35.json deleted file mode 100644 index 4acf4ce..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block35.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block35", "length":4, "width":3, "height":3, "mass":7.2, "colorCode":"E74", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block350.json b/uml2es/examples/blockFactory/data/blockfactory/block/block350.json deleted file mode 100644 index 9a2df88..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block350.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block350", "length":5, "width":1, "height":2, "mass":2, "colorCode":"R22", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block351.json b/uml2es/examples/blockFactory/data/blockfactory/block/block351.json deleted file mode 100644 index 1c3f894..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block351.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block351", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"W9", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block352.json b/uml2es/examples/blockFactory/data/blockfactory/block/block352.json deleted file mode 100644 index 396b8be..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block352.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block352", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"E33", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block353.json b/uml2es/examples/blockFactory/data/blockfactory/block/block353.json deleted file mode 100644 index 67cff4f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block353.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block353", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"YG63", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block354.json b/uml2es/examples/blockFactory/data/blockfactory/block/block354.json deleted file mode 100644 index b82a72b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block354.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block354", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"R08", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block355.json b/uml2es/examples/blockFactory/data/blockfactory/block/block355.json deleted file mode 100644 index cc88df5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block355.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block355", "length":1, "width":1, "height":4, "mass":0.8, "colorCode":"RV04", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block356.json b/uml2es/examples/blockFactory/data/blockfactory/block/block356.json deleted file mode 100644 index c2a1b4b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block356.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block356", "length":5, "width":5, "height":5, "mass":25, "colorCode":"RV00", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block357.json b/uml2es/examples/blockFactory/data/blockfactory/block/block357.json deleted file mode 100644 index f92ab1e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block357.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block357", "length":5, "width":4, "height":4, "mass":16, "colorCode":"0", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block358.json b/uml2es/examples/blockFactory/data/blockfactory/block/block358.json deleted file mode 100644 index d80c0b4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block358.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block358", "length":1, "width":4, "height":4, "mass":0.8, "colorCode":"BG72", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block359.json b/uml2es/examples/blockFactory/data/blockfactory/block/block359.json deleted file mode 100644 index d78efb8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block359.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block359", "length":5, "width":2, "height":4, "mass":8, "colorCode":"BV34", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block36.json b/uml2es/examples/blockFactory/data/blockfactory/block/block36.json deleted file mode 100644 index 647b15c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block36.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block36", "length":3, "width":4, "height":3, "mass":1.8, "colorCode":"BG09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block360.json b/uml2es/examples/blockFactory/data/blockfactory/block/block360.json deleted file mode 100644 index 8b07e2a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block360.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block360", "length":4, "width":4, "height":2, "mass":6.4, "colorCode":"Y02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block361.json b/uml2es/examples/blockFactory/data/blockfactory/block/block361.json deleted file mode 100644 index ecea690..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block361.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block361", "length":3, "width":2, "height":4, "mass":4.8, "colorCode":"E18", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block362.json b/uml2es/examples/blockFactory/data/blockfactory/block/block362.json deleted file mode 100644 index 402ca75..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block362.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block362", "length":5, "width":2, "height":3, "mass":6, "colorCode":"W6", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block363.json b/uml2es/examples/blockFactory/data/blockfactory/block/block363.json deleted file mode 100644 index df42e51..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block363.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block363", "length":3, "width":5, "height":2, "mass":6, "colorCode":"YR27", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block364.json b/uml2es/examples/blockFactory/data/blockfactory/block/block364.json deleted file mode 100644 index 8fc5fc8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block364.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block364", "length":1, "width":4, "height":2, "mass":0.4, "colorCode":"Y28", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block365.json b/uml2es/examples/blockFactory/data/blockfactory/block/block365.json deleted file mode 100644 index c369bfe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block365.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block365", "length":4, "width":4, "height":2, "mass":1.6, "colorCode":"YG95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block366.json b/uml2es/examples/blockFactory/data/blockfactory/block/block366.json deleted file mode 100644 index 6fa301a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block366.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block366", "length":4, "width":5, "height":1, "mass":4, "colorCode":"Y08", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block367.json b/uml2es/examples/blockFactory/data/blockfactory/block/block367.json deleted file mode 100644 index 1422846..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block367.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block367", "length":4, "width":3, "height":4, "mass":2.4, "colorCode":"YR68", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block368.json b/uml2es/examples/blockFactory/data/blockfactory/block/block368.json deleted file mode 100644 index 6a1a396..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block368.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block368", "length":3, "width":4, "height":4, "mass":9.6, "colorCode":"BG13", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block369.json b/uml2es/examples/blockFactory/data/blockfactory/block/block369.json deleted file mode 100644 index 0e5b440..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block369.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block369", "length":3, "width":5, "height":3, "mass":9, "colorCode":"N4", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block37.json b/uml2es/examples/blockFactory/data/blockfactory/block/block37.json deleted file mode 100644 index 08a2611..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block37.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block37", "length":5, "width":3, "height":5, "mass":15, "colorCode":"G05", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block370.json b/uml2es/examples/blockFactory/data/blockfactory/block/block370.json deleted file mode 100644 index 5c35613..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block370.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block370", "length":5, "width":2, "height":4, "mass":8, "colorCode":"E87", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block371.json b/uml2es/examples/blockFactory/data/blockfactory/block/block371.json deleted file mode 100644 index 2069ebe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block371.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block371", "length":1, "width":5, "height":1, "mass":0.25, "colorCode":"R22", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block372.json b/uml2es/examples/blockFactory/data/blockfactory/block/block372.json deleted file mode 100644 index 90f3116..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block372.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block372", "length":5, "width":2, "height":1, "mass":2, "colorCode":"V99", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block373.json b/uml2es/examples/blockFactory/data/blockfactory/block/block373.json deleted file mode 100644 index fbfcbd9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block373.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block373", "length":1, "width":2, "height":5, "mass":2, "colorCode":"T2", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block374.json b/uml2es/examples/blockFactory/data/blockfactory/block/block374.json deleted file mode 100644 index 57ac680..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block374.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block374", "length":3, "width":2, "height":2, "mass":0.6, "colorCode":"YR07", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block375.json b/uml2es/examples/blockFactory/data/blockfactory/block/block375.json deleted file mode 100644 index ad3173d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block375.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block375", "length":5, "width":2, "height":3, "mass":6, "colorCode":"E0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block376.json b/uml2es/examples/blockFactory/data/blockfactory/block/block376.json deleted file mode 100644 index 87c239e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block376.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block376", "length":5, "width":1, "height":1, "mass":0.25, "colorCode":"R0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block377.json b/uml2es/examples/blockFactory/data/blockfactory/block/block377.json deleted file mode 100644 index 0c8540d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block377.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block377", "length":5, "width":3, "height":1, "mass":0.75, "colorCode":"T3", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block378.json b/uml2es/examples/blockFactory/data/blockfactory/block/block378.json deleted file mode 100644 index 3dc5564..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block378.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block378", "length":5, "width":4, "height":5, "mass":20, "colorCode":"BG02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block379.json b/uml2es/examples/blockFactory/data/blockfactory/block/block379.json deleted file mode 100644 index 016c93f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block379.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block379", "length":2, "width":5, "height":1, "mass":2, "colorCode":"YR09", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block38.json b/uml2es/examples/blockFactory/data/blockfactory/block/block38.json deleted file mode 100644 index c4161b7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block38.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block38", "length":4, "width":4, "height":5, "mass":4, "colorCode":"B32", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block380.json b/uml2es/examples/blockFactory/data/blockfactory/block/block380.json deleted file mode 100644 index 47d932f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block380.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block380", "length":4, "width":5, "height":4, "mass":4, "colorCode":"BG93", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block381.json b/uml2es/examples/blockFactory/data/blockfactory/block/block381.json deleted file mode 100644 index 0f448a9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block381.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block381", "length":1, "width":1, "height":1, "mass":0.2, "colorCode":"G05", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block382.json b/uml2es/examples/blockFactory/data/blockfactory/block/block382.json deleted file mode 100644 index 68da130..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block382.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block382", "length":2, "width":3, "height":2, "mass":2.4, "colorCode":"YR23", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block383.json b/uml2es/examples/blockFactory/data/blockfactory/block/block383.json deleted file mode 100644 index d93a929..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block383.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block383", "length":2, "width":5, "height":3, "mass":6, "colorCode":"E93", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block384.json b/uml2es/examples/blockFactory/data/blockfactory/block/block384.json deleted file mode 100644 index e6f310c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block384.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block384", "length":3, "width":5, "height":1, "mass":0.75, "colorCode":"V95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block385.json b/uml2es/examples/blockFactory/data/blockfactory/block/block385.json deleted file mode 100644 index 45e09d9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block385.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block385", "length":2, "width":4, "height":1, "mass":1.6, "colorCode":"B69", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block386.json b/uml2es/examples/blockFactory/data/blockfactory/block/block386.json deleted file mode 100644 index b96ae26..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block386.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block386", "length":2, "width":3, "height":2, "mass":2.4, "colorCode":"B66", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block387.json b/uml2es/examples/blockFactory/data/blockfactory/block/block387.json deleted file mode 100644 index d578c59..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block387.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block387", "length":3, "width":5, "height":5, "mass":15, "colorCode":"R56", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block388.json b/uml2es/examples/blockFactory/data/blockfactory/block/block388.json deleted file mode 100644 index fdf0810..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block388.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block388", "length":2, "width":4, "height":5, "mass":2, "colorCode":"YG95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block389.json b/uml2es/examples/blockFactory/data/blockfactory/block/block389.json deleted file mode 100644 index 198aab2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block389.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block389", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"G24", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block39.json b/uml2es/examples/blockFactory/data/blockfactory/block/block39.json deleted file mode 100644 index 74da67e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block39.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block39", "length":3, "width":2, "height":2, "mass":2.4, "colorCode":"W9", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block390.json b/uml2es/examples/blockFactory/data/blockfactory/block/block390.json deleted file mode 100644 index bca0c64..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block390.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block390", "length":5, "width":3, "height":5, "mass":3.75, "colorCode":"BG93", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block391.json b/uml2es/examples/blockFactory/data/blockfactory/block/block391.json deleted file mode 100644 index 826f039..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block391.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block391", "length":2, "width":4, "height":3, "mass":4.8, "colorCode":"N1", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block392.json b/uml2es/examples/blockFactory/data/blockfactory/block/block392.json deleted file mode 100644 index 8752cfe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block392.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block392", "length":4, "width":4, "height":5, "mass":16, "colorCode":"C6", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block393.json b/uml2es/examples/blockFactory/data/blockfactory/block/block393.json deleted file mode 100644 index 960ccb4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block393.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block393", "length":2, "width":1, "height":3, "mass":1.2, "colorCode":"E18", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block394.json b/uml2es/examples/blockFactory/data/blockfactory/block/block394.json deleted file mode 100644 index 1f75ed3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block394.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block394", "length":2, "width":5, "height":1, "mass":0.5, "colorCode":"YR01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block395.json b/uml2es/examples/blockFactory/data/blockfactory/block/block395.json deleted file mode 100644 index b7eb4b0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block395.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block395", "length":3, "width":5, "height":5, "mass":15, "colorCode":"YR21", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block396.json b/uml2es/examples/blockFactory/data/blockfactory/block/block396.json deleted file mode 100644 index dde0560..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block396.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block396", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"YG03", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block397.json b/uml2es/examples/blockFactory/data/blockfactory/block/block397.json deleted file mode 100644 index 32545d6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block397.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block397", "length":4, "width":3, "height":2, "mass":1.2, "colorCode":"E09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block398.json b/uml2es/examples/blockFactory/data/blockfactory/block/block398.json deleted file mode 100644 index af1bff6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block398.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block398", "length":1, "width":5, "height":1, "mass":1, "colorCode":"FV2", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block399.json b/uml2es/examples/blockFactory/data/blockfactory/block/block399.json deleted file mode 100644 index 389c5bb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block399.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block399", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"B79", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block4.json b/uml2es/examples/blockFactory/data/blockfactory/block/block4.json deleted file mode 100644 index 81882f5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block4.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block4", "length":1, "width":2, "height":5, "mass":2, "colorCode":"W7", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block40.json b/uml2es/examples/blockFactory/data/blockfactory/block/block40.json deleted file mode 100644 index 848235b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block40.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block40", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"YG11", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block400.json b/uml2es/examples/blockFactory/data/blockfactory/block/block400.json deleted file mode 100644 index 6d66fa7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block400.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block400", "length":2, "width":4, "height":3, "mass":4.8, "colorCode":"B93", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block401.json b/uml2es/examples/blockFactory/data/blockfactory/block/block401.json deleted file mode 100644 index 501d174..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block401.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block401", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"B06", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block402.json b/uml2es/examples/blockFactory/data/blockfactory/block/block402.json deleted file mode 100644 index 99989f4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block402.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block402", "length":4, "width":3, "height":4, "mass":2.4, "colorCode":"E93", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block403.json b/uml2es/examples/blockFactory/data/blockfactory/block/block403.json deleted file mode 100644 index c714f34..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block403.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block403", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"E41", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block404.json b/uml2es/examples/blockFactory/data/blockfactory/block/block404.json deleted file mode 100644 index c02255a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block404.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block404", "length":5, "width":2, "height":2, "mass":4, "colorCode":"B26", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block405.json b/uml2es/examples/blockFactory/data/blockfactory/block/block405.json deleted file mode 100644 index 231fa46..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block405.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block405", "length":5, "width":3, "height":5, "mass":3.75, "colorCode":"E08", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block406.json b/uml2es/examples/blockFactory/data/blockfactory/block/block406.json deleted file mode 100644 index a94d368..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block406.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block406", "length":3, "width":5, "height":4, "mass":12, "colorCode":"BG05", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block407.json b/uml2es/examples/blockFactory/data/blockfactory/block/block407.json deleted file mode 100644 index 04e76bc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block407.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block407", "length":5, "width":4, "height":2, "mass":8, "colorCode":"G05", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block408.json b/uml2es/examples/blockFactory/data/blockfactory/block/block408.json deleted file mode 100644 index 6d8261c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block408.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block408", "length":1, "width":4, "height":1, "mass":0.8, "colorCode":"E47", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block409.json b/uml2es/examples/blockFactory/data/blockfactory/block/block409.json deleted file mode 100644 index 2f245a4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block409.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block409", "length":5, "width":4, "height":3, "mass":12, "colorCode":"E0000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block41.json b/uml2es/examples/blockFactory/data/blockfactory/block/block41.json deleted file mode 100644 index ac8eae2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block41.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block41", "length":5, "width":5, "height":4, "mass":5, "colorCode":"V06", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block410.json b/uml2es/examples/blockFactory/data/blockfactory/block/block410.json deleted file mode 100644 index f9b5f63..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block410.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block410", "length":5, "width":2, "height":3, "mass":6, "colorCode":"RV09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block411.json b/uml2es/examples/blockFactory/data/blockfactory/block/block411.json deleted file mode 100644 index a61f0fe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block411.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block411", "length":5, "width":2, "height":3, "mass":6, "colorCode":"B29", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block412.json b/uml2es/examples/blockFactory/data/blockfactory/block/block412.json deleted file mode 100644 index e7e1f2b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block412.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block412", "length":1, "width":4, "height":4, "mass":3.2, "colorCode":"C8", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block413.json b/uml2es/examples/blockFactory/data/blockfactory/block/block413.json deleted file mode 100644 index 26749b4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block413.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block413", "length":5, "width":3, "height":4, "mass":12, "colorCode":"E09", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block414.json b/uml2es/examples/blockFactory/data/blockfactory/block/block414.json deleted file mode 100644 index 01ceb11..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block414.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block414", "length":2, "width":2, "height":1, "mass":0.2, "colorCode":"E08", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block415.json b/uml2es/examples/blockFactory/data/blockfactory/block/block415.json deleted file mode 100644 index 1ae7b45..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block415.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block415", "length":1, "width":2, "height":1, "mass":0.1, "colorCode":"YG67", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block416.json b/uml2es/examples/blockFactory/data/blockfactory/block/block416.json deleted file mode 100644 index fa103c8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block416.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block416", "length":3, "width":1, "height":5, "mass":3, "colorCode":"E02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block417.json b/uml2es/examples/blockFactory/data/blockfactory/block/block417.json deleted file mode 100644 index b2b7d4b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block417.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block417", "length":4, "width":5, "height":4, "mass":4, "colorCode":"RV55", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block418.json b/uml2es/examples/blockFactory/data/blockfactory/block/block418.json deleted file mode 100644 index cb38746..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block418.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block418", "length":1, "width":3, "height":5, "mass":3, "colorCode":"N5", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block419.json b/uml2es/examples/blockFactory/data/blockfactory/block/block419.json deleted file mode 100644 index 50a2224..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block419.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block419", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"G03", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block42.json b/uml2es/examples/blockFactory/data/blockfactory/block/block42.json deleted file mode 100644 index ca805a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block42.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block42", "length":1, "width":5, "height":4, "mass":4, "colorCode":"B26", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block420.json b/uml2es/examples/blockFactory/data/blockfactory/block/block420.json deleted file mode 100644 index 2a1561d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block420.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block420", "length":3, "width":3, "height":3, "mass":5.4, "colorCode":"R17", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block421.json b/uml2es/examples/blockFactory/data/blockfactory/block/block421.json deleted file mode 100644 index e85f6e9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block421.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block421", "length":2, "width":4, "height":1, "mass":1.6, "colorCode":"YG63", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block422.json b/uml2es/examples/blockFactory/data/blockfactory/block/block422.json deleted file mode 100644 index c70772a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block422.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block422", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"BV13", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block423.json b/uml2es/examples/blockFactory/data/blockfactory/block/block423.json deleted file mode 100644 index 3f981e0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block423.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block423", "length":2, "width":1, "height":5, "mass":2, "colorCode":"BG18", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block424.json b/uml2es/examples/blockFactory/data/blockfactory/block/block424.json deleted file mode 100644 index 181142d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block424.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block424", "length":3, "width":4, "height":2, "mass":1.2, "colorCode":"BV02", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block425.json b/uml2es/examples/blockFactory/data/blockfactory/block/block425.json deleted file mode 100644 index e9f45e5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block425.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block425", "length":2, "width":1, "height":2, "mass":0.8, "colorCode":"B45", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block426.json b/uml2es/examples/blockFactory/data/blockfactory/block/block426.json deleted file mode 100644 index 823d3d0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block426.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block426", "length":3, "width":5, "height":1, "mass":3, "colorCode":"G21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block427.json b/uml2es/examples/blockFactory/data/blockfactory/block/block427.json deleted file mode 100644 index fed2a4d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block427.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block427", "length":4, "width":4, "height":4, "mass":3.2, "colorCode":"C00", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block428.json b/uml2es/examples/blockFactory/data/blockfactory/block/block428.json deleted file mode 100644 index 42c2ccb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block428.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block428", "length":1, "width":5, "height":1, "mass":1, "colorCode":"BG93", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block429.json b/uml2es/examples/blockFactory/data/blockfactory/block/block429.json deleted file mode 100644 index c255cb3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block429.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block429", "length":1, "width":5, "height":1, "mass":1, "colorCode":"B18", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block43.json b/uml2es/examples/blockFactory/data/blockfactory/block/block43.json deleted file mode 100644 index 5c308a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block43.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block43", "length":3, "width":5, "height":5, "mass":3.75, "colorCode":"YR65", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block430.json b/uml2es/examples/blockFactory/data/blockfactory/block/block430.json deleted file mode 100644 index e4ca79c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block430.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block430", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"G00", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block431.json b/uml2es/examples/blockFactory/data/blockfactory/block/block431.json deleted file mode 100644 index 5c0568a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block431.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block431", "length":3, "width":3, "height":4, "mass":7.2, "colorCode":"RV000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block432.json b/uml2es/examples/blockFactory/data/blockfactory/block/block432.json deleted file mode 100644 index e6bddc8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block432.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block432", "length":2, "width":5, "height":1, "mass":2, "colorCode":"YR01", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block433.json b/uml2es/examples/blockFactory/data/blockfactory/block/block433.json deleted file mode 100644 index c143c4e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block433.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block433", "length":3, "width":4, "height":4, "mass":9.6, "colorCode":"E79", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block434.json b/uml2es/examples/blockFactory/data/blockfactory/block/block434.json deleted file mode 100644 index 65196e4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block434.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block434", "length":5, "width":1, "height":3, "mass":3, "colorCode":"RV95", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block435.json b/uml2es/examples/blockFactory/data/blockfactory/block/block435.json deleted file mode 100644 index 9c2d143..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block435.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block435", "length":2, "width":1, "height":2, "mass":0.8, "colorCode":"YR14", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block436.json b/uml2es/examples/blockFactory/data/blockfactory/block/block436.json deleted file mode 100644 index 0872b1f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block436.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block436", "length":4, "width":4, "height":4, "mass":12.8, "colorCode":"RV91", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block437.json b/uml2es/examples/blockFactory/data/blockfactory/block/block437.json deleted file mode 100644 index 6c13913..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block437.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block437", "length":4, "width":1, "height":5, "mass":4, "colorCode":"Y06", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block438.json b/uml2es/examples/blockFactory/data/blockfactory/block/block438.json deleted file mode 100644 index 4bc23ee..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block438.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block438", "length":5, "width":3, "height":3, "mass":9, "colorCode":"V04", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block439.json b/uml2es/examples/blockFactory/data/blockfactory/block/block439.json deleted file mode 100644 index e4320ca..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block439.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block439", "length":1, "width":5, "height":5, "mass":1.25, "colorCode":"YG05", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block44.json b/uml2es/examples/blockFactory/data/blockfactory/block/block44.json deleted file mode 100644 index c622330..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block44.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block44", "length":4, "width":5, "height":2, "mass":8, "colorCode":"R12", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block440.json b/uml2es/examples/blockFactory/data/blockfactory/block/block440.json deleted file mode 100644 index a4580b7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block440.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block440", "length":1, "width":1, "height":5, "mass":1, "colorCode":"G03", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block441.json b/uml2es/examples/blockFactory/data/blockfactory/block/block441.json deleted file mode 100644 index 28a46a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block441.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block441", "length":1, "width":3, "height":1, "mass":0.6, "colorCode":"G94", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block442.json b/uml2es/examples/blockFactory/data/blockfactory/block/block442.json deleted file mode 100644 index fcde682..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block442.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block442", "length":1, "width":1, "height":5, "mass":1, "colorCode":"B69", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block443.json b/uml2es/examples/blockFactory/data/blockfactory/block/block443.json deleted file mode 100644 index 0a6c163..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block443.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block443", "length":3, "width":5, "height":2, "mass":1.5, "colorCode":"V04", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block444.json b/uml2es/examples/blockFactory/data/blockfactory/block/block444.json deleted file mode 100644 index bf849d0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block444.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block444", "length":3, "width":3, "height":3, "mass":5.4, "colorCode":"N8", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block445.json b/uml2es/examples/blockFactory/data/blockfactory/block/block445.json deleted file mode 100644 index 1f5038a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block445.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block445", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"C3", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block446.json b/uml2es/examples/blockFactory/data/blockfactory/block/block446.json deleted file mode 100644 index c3da332..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block446.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block446", "length":1, "width":5, "height":5, "mass":5, "colorCode":"YG41", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block447.json b/uml2es/examples/blockFactory/data/blockfactory/block/block447.json deleted file mode 100644 index c0de075..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block447.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block447", "length":3, "width":3, "height":3, "mass":5.4, "colorCode":"G12", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block448.json b/uml2es/examples/blockFactory/data/blockfactory/block/block448.json deleted file mode 100644 index cbb9ba2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block448.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block448", "length":5, "width":5, "height":4, "mass":20, "colorCode":"RV14", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block449.json b/uml2es/examples/blockFactory/data/blockfactory/block/block449.json deleted file mode 100644 index 47ee10d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block449.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block449", "length":1, "width":2, "height":4, "mass":0.4, "colorCode":"V17", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block45.json b/uml2es/examples/blockFactory/data/blockfactory/block/block45.json deleted file mode 100644 index dfbf2f1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block45.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block45", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"FRV1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block450.json b/uml2es/examples/blockFactory/data/blockfactory/block/block450.json deleted file mode 100644 index 3cc2a4b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block450.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block450", "length":3, "width":4, "height":1, "mass":2.4, "colorCode":"C10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block451.json b/uml2es/examples/blockFactory/data/blockfactory/block/block451.json deleted file mode 100644 index 1d1e9ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block451.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block451", "length":2, "width":5, "height":1, "mass":2, "colorCode":"W8", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block452.json b/uml2es/examples/blockFactory/data/blockfactory/block/block452.json deleted file mode 100644 index ff80134..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block452.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block452", "length":2, "width":5, "height":5, "mass":2.5, "colorCode":"G0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block453.json b/uml2es/examples/blockFactory/data/blockfactory/block/block453.json deleted file mode 100644 index e832b32..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block453.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block453", "length":3, "width":4, "height":1, "mass":0.6, "colorCode":"BV20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block454.json b/uml2es/examples/blockFactory/data/blockfactory/block/block454.json deleted file mode 100644 index 63d6b18..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block454.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block454", "length":1, "width":1, "height":4, "mass":0.8, "colorCode":"Y35", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block455.json b/uml2es/examples/blockFactory/data/blockfactory/block/block455.json deleted file mode 100644 index 2b32546..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block455.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block455", "length":5, "width":1, "height":3, "mass":3, "colorCode":"BG57", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block456.json b/uml2es/examples/blockFactory/data/blockfactory/block/block456.json deleted file mode 100644 index dffd6ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block456.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block456", "length":5, "width":4, "height":5, "mass":20, "colorCode":"W1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block457.json b/uml2es/examples/blockFactory/data/blockfactory/block/block457.json deleted file mode 100644 index 11a2f6a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block457.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block457", "length":2, "width":2, "height":3, "mass":2.4, "colorCode":"Y18", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block458.json b/uml2es/examples/blockFactory/data/blockfactory/block/block458.json deleted file mode 100644 index 6988142..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block458.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block458", "length":5, "width":2, "height":1, "mass":2, "colorCode":"RV99", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block459.json b/uml2es/examples/blockFactory/data/blockfactory/block/block459.json deleted file mode 100644 index afe404f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block459.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block459", "length":5, "width":2, "height":5, "mass":10, "colorCode":"R22", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block46.json b/uml2es/examples/blockFactory/data/blockfactory/block/block46.json deleted file mode 100644 index 6cdd496..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block46.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block46", "length":3, "width":5, "height":3, "mass":9, "colorCode":"R21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block460.json b/uml2es/examples/blockFactory/data/blockfactory/block/block460.json deleted file mode 100644 index 630f911..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block460.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block460", "length":1, "width":4, "height":2, "mass":1.6, "colorCode":"W2", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block461.json b/uml2es/examples/blockFactory/data/blockfactory/block/block461.json deleted file mode 100644 index 73c7ad5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block461.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block461", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"YR07", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block462.json b/uml2es/examples/blockFactory/data/blockfactory/block/block462.json deleted file mode 100644 index 6894389..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block462.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block462", "length":4, "width":3, "height":4, "mass":9.6, "colorCode":"T2", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block463.json b/uml2es/examples/blockFactory/data/blockfactory/block/block463.json deleted file mode 100644 index e6d429b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block463.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block463", "length":3, "width":4, "height":5, "mass":12, "colorCode":"E19", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block464.json b/uml2es/examples/blockFactory/data/blockfactory/block/block464.json deleted file mode 100644 index 6c3a453..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block464.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block464", "length":5, "width":4, "height":5, "mass":20, "colorCode":"V04", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block465.json b/uml2es/examples/blockFactory/data/blockfactory/block/block465.json deleted file mode 100644 index 9052282..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block465.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block465", "length":2, "width":4, "height":5, "mass":8, "colorCode":"G000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block466.json b/uml2es/examples/blockFactory/data/blockfactory/block/block466.json deleted file mode 100644 index 639b510..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block466.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block466", "length":3, "width":5, "height":2, "mass":6, "colorCode":"BG96", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block467.json b/uml2es/examples/blockFactory/data/blockfactory/block/block467.json deleted file mode 100644 index 4c4c8a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block467.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block467", "length":3, "width":4, "height":4, "mass":2.4, "colorCode":"R20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block468.json b/uml2es/examples/blockFactory/data/blockfactory/block/block468.json deleted file mode 100644 index f2e9fbc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block468.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block468", "length":2, "width":2, "height":5, "mass":1, "colorCode":"R43", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block469.json b/uml2es/examples/blockFactory/data/blockfactory/block/block469.json deleted file mode 100644 index a32938d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block469.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block469", "length":5, "width":5, "height":5, "mass":6.25, "colorCode":"YR65", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block47.json b/uml2es/examples/blockFactory/data/blockfactory/block/block47.json deleted file mode 100644 index e989ec6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block47.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block47", "length":5, "width":2, "height":4, "mass":8, "colorCode":"B32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block470.json b/uml2es/examples/blockFactory/data/blockfactory/block/block470.json deleted file mode 100644 index 6c84d84..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block470.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block470", "length":1, "width":5, "height":2, "mass":2, "colorCode":"E74", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block471.json b/uml2es/examples/blockFactory/data/blockfactory/block/block471.json deleted file mode 100644 index 50a1fc8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block471.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block471", "length":5, "width":4, "height":1, "mass":4, "colorCode":"RV09", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block472.json b/uml2es/examples/blockFactory/data/blockfactory/block/block472.json deleted file mode 100644 index 6bdb8b4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block472.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block472", "length":5, "width":2, "height":5, "mass":10, "colorCode":"R00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block473.json b/uml2es/examples/blockFactory/data/blockfactory/block/block473.json deleted file mode 100644 index 5fde22c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block473.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block473", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"B0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block474.json b/uml2es/examples/blockFactory/data/blockfactory/block/block474.json deleted file mode 100644 index 5c43dda..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block474.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block474", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"W2", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block475.json b/uml2es/examples/blockFactory/data/blockfactory/block/block475.json deleted file mode 100644 index 91657a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block475.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block475", "length":4, "width":5, "height":3, "mass":3, "colorCode":"B34", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block476.json b/uml2es/examples/blockFactory/data/blockfactory/block/block476.json deleted file mode 100644 index d174280..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block476.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block476", "length":1, "width":2, "height":4, "mass":0.4, "colorCode":"RV06", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block477.json b/uml2es/examples/blockFactory/data/blockfactory/block/block477.json deleted file mode 100644 index 4537522..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block477.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block477", "length":5, "width":1, "height":5, "mass":5, "colorCode":"Y21", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block478.json b/uml2es/examples/blockFactory/data/blockfactory/block/block478.json deleted file mode 100644 index b6fd6cc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block478.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block478", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"T8", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block479.json b/uml2es/examples/blockFactory/data/blockfactory/block/block479.json deleted file mode 100644 index d1455f8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block479.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block479", "length":3, "width":3, "height":3, "mass":5.4, "colorCode":"R000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block48.json b/uml2es/examples/blockFactory/data/blockfactory/block/block48.json deleted file mode 100644 index ec011f4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block48.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block48", "length":1, "width":5, "height":1, "mass":1, "colorCode":"RV52", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block480.json b/uml2es/examples/blockFactory/data/blockfactory/block/block480.json deleted file mode 100644 index 1454ebf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block480.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block480", "length":4, "width":1, "height":5, "mass":4, "colorCode":"YR0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block481.json b/uml2es/examples/blockFactory/data/blockfactory/block/block481.json deleted file mode 100644 index 19720c9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block481.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block481", "length":5, "width":4, "height":4, "mass":16, "colorCode":"BV00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block482.json b/uml2es/examples/blockFactory/data/blockfactory/block/block482.json deleted file mode 100644 index 84ee609..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block482.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block482", "length":2, "width":4, "height":5, "mass":2, "colorCode":"100", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block483.json b/uml2es/examples/blockFactory/data/blockfactory/block/block483.json deleted file mode 100644 index 2e6bcec..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block483.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block483", "length":5, "width":1, "height":2, "mass":2, "colorCode":"RV66", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block484.json b/uml2es/examples/blockFactory/data/blockfactory/block/block484.json deleted file mode 100644 index 7c6a380..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block484.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block484", "length":5, "width":2, "height":3, "mass":1.5, "colorCode":"B60", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block485.json b/uml2es/examples/blockFactory/data/blockfactory/block/block485.json deleted file mode 100644 index b9b0bee..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block485.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block485", "length":4, "width":4, "height":3, "mass":9.6, "colorCode":"BG75", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block486.json b/uml2es/examples/blockFactory/data/blockfactory/block/block486.json deleted file mode 100644 index 7aacf1c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block486.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block486", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"V09", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block487.json b/uml2es/examples/blockFactory/data/blockfactory/block/block487.json deleted file mode 100644 index f5bdcc5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block487.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block487", "length":4, "width":3, "height":2, "mass":4.8, "colorCode":"100", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block488.json b/uml2es/examples/blockFactory/data/blockfactory/block/block488.json deleted file mode 100644 index ccf31e8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block488.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block488", "length":5, "width":5, "height":3, "mass":15, "colorCode":"W0", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block489.json b/uml2es/examples/blockFactory/data/blockfactory/block/block489.json deleted file mode 100644 index 665e8d5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block489.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block489", "length":4, "width":2, "height":1, "mass":1.6, "colorCode":"G05", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block49.json b/uml2es/examples/blockFactory/data/blockfactory/block/block49.json deleted file mode 100644 index e070e6a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block49.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block49", "length":3, "width":2, "height":2, "mass":2.4, "colorCode":"BG93", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block490.json b/uml2es/examples/blockFactory/data/blockfactory/block/block490.json deleted file mode 100644 index 3b4755c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block490.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block490", "length":2, "width":3, "height":4, "mass":4.8, "colorCode":"B52", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block491.json b/uml2es/examples/blockFactory/data/blockfactory/block/block491.json deleted file mode 100644 index 8faf6f1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block491.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block491", "length":1, "width":1, "height":1, "mass":0.2, "colorCode":"YG23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block492.json b/uml2es/examples/blockFactory/data/blockfactory/block/block492.json deleted file mode 100644 index 1a2c666..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block492.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block492", "length":5, "width":3, "height":5, "mass":3.75, "colorCode":"B66", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block493.json b/uml2es/examples/blockFactory/data/blockfactory/block/block493.json deleted file mode 100644 index 687dcc3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block493.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block493", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"W1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block494.json b/uml2es/examples/blockFactory/data/blockfactory/block/block494.json deleted file mode 100644 index 84c9276..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block494.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block494", "length":2, "width":1, "height":4, "mass":1.6, "colorCode":"Y32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block495.json b/uml2es/examples/blockFactory/data/blockfactory/block/block495.json deleted file mode 100644 index b880456..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block495.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block495", "length":3, "width":1, "height":3, "mass":1.8, "colorCode":"E79", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block496.json b/uml2es/examples/blockFactory/data/blockfactory/block/block496.json deleted file mode 100644 index d005b29..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block496.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block496", "length":1, "width":2, "height":5, "mass":0.5, "colorCode":"C10", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block497.json b/uml2es/examples/blockFactory/data/blockfactory/block/block497.json deleted file mode 100644 index 2e739b7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block497.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block497", "length":5, "width":5, "height":5, "mass":25, "colorCode":"G07", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block498.json b/uml2es/examples/blockFactory/data/blockfactory/block/block498.json deleted file mode 100644 index 3105b8f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block498.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block498", "length":2, "width":4, "height":1, "mass":0.4, "colorCode":"BG05", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block499.json b/uml2es/examples/blockFactory/data/blockfactory/block/block499.json deleted file mode 100644 index 81573e6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block499.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block499", "length":3, "width":3, "height":5, "mass":9, "colorCode":"BV13", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block5.json b/uml2es/examples/blockFactory/data/blockfactory/block/block5.json deleted file mode 100644 index cdab04a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block5.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block5", "length":3, "width":3, "height":2, "mass":0.9, "colorCode":"R20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block50.json b/uml2es/examples/blockFactory/data/blockfactory/block/block50.json deleted file mode 100644 index a6c2d5a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block50.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block50", "length":3, "width":1, "height":1, "mass":0.15, "colorCode":"BG10", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block500.json b/uml2es/examples/blockFactory/data/blockfactory/block/block500.json deleted file mode 100644 index d01fd9e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block500.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block500", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"YG41", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block501.json b/uml2es/examples/blockFactory/data/blockfactory/block/block501.json deleted file mode 100644 index 3a13225..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block501.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block501", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"T1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block502.json b/uml2es/examples/blockFactory/data/blockfactory/block/block502.json deleted file mode 100644 index 1ec53c6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block502.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block502", "length":3, "width":2, "height":5, "mass":1.5, "colorCode":"YG11", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block503.json b/uml2es/examples/blockFactory/data/blockfactory/block/block503.json deleted file mode 100644 index a0b932a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block503.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block503", "length":4, "width":3, "height":1, "mass":2.4, "colorCode":"RV42", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block504.json b/uml2es/examples/blockFactory/data/blockfactory/block/block504.json deleted file mode 100644 index 06e25e1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block504.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block504", "length":3, "width":3, "height":5, "mass":9, "colorCode":"B69", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block505.json b/uml2es/examples/blockFactory/data/blockfactory/block/block505.json deleted file mode 100644 index ebd2f0b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block505.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block505", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"YR65", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block506.json b/uml2es/examples/blockFactory/data/blockfactory/block/block506.json deleted file mode 100644 index be054d4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block506.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block506", "length":4, "width":5, "height":4, "mass":4, "colorCode":"B97", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block507.json b/uml2es/examples/blockFactory/data/blockfactory/block/block507.json deleted file mode 100644 index fb3f508..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block507.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block507", "length":5, "width":1, "height":5, "mass":5, "colorCode":"B12", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block508.json b/uml2es/examples/blockFactory/data/blockfactory/block/block508.json deleted file mode 100644 index fa1dcad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block508.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block508", "length":3, "width":4, "height":5, "mass":12, "colorCode":"N4", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block509.json b/uml2es/examples/blockFactory/data/blockfactory/block/block509.json deleted file mode 100644 index faf3a0f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block509.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block509", "length":1, "width":4, "height":5, "mass":4, "colorCode":"E30", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block51.json b/uml2es/examples/blockFactory/data/blockfactory/block/block51.json deleted file mode 100644 index 2d83e22..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block51.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block51", "length":5, "width":2, "height":2, "mass":4, "colorCode":"YR09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block510.json b/uml2es/examples/blockFactory/data/blockfactory/block/block510.json deleted file mode 100644 index 92a448d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block510.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block510", "length":4, "width":2, "height":3, "mass":4.8, "colorCode":"RV34", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block511.json b/uml2es/examples/blockFactory/data/blockfactory/block/block511.json deleted file mode 100644 index 5b2b554..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block511.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block511", "length":5, "width":5, "height":2, "mass":10, "colorCode":"E84", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block512.json b/uml2es/examples/blockFactory/data/blockfactory/block/block512.json deleted file mode 100644 index 4cd3672..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block512.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block512", "length":1, "width":3, "height":5, "mass":3, "colorCode":"E37", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block513.json b/uml2es/examples/blockFactory/data/blockfactory/block/block513.json deleted file mode 100644 index 1edb492..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block513.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block513", "length":1, "width":5, "height":1, "mass":1, "colorCode":"YG07", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block514.json b/uml2es/examples/blockFactory/data/blockfactory/block/block514.json deleted file mode 100644 index 0275e96..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block514.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block514", "length":5, "width":5, "height":3, "mass":15, "colorCode":"YR07", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block515.json b/uml2es/examples/blockFactory/data/blockfactory/block/block515.json deleted file mode 100644 index a23dee0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block515.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block515", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"RV000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block516.json b/uml2es/examples/blockFactory/data/blockfactory/block/block516.json deleted file mode 100644 index 23cd829..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block516.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block516", "length":1, "width":1, "height":1, "mass":0.2, "colorCode":"V25", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block517.json b/uml2es/examples/blockFactory/data/blockfactory/block/block517.json deleted file mode 100644 index 1b8b57b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block517.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block517", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"G02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block518.json b/uml2es/examples/blockFactory/data/blockfactory/block/block518.json deleted file mode 100644 index c3ab286..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block518.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block518", "length":4, "width":1, "height":3, "mass":0.6, "colorCode":"T0", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block519.json b/uml2es/examples/blockFactory/data/blockfactory/block/block519.json deleted file mode 100644 index d76fa6e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block519.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block519", "length":5, "width":1, "height":5, "mass":5, "colorCode":"E99", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block52.json b/uml2es/examples/blockFactory/data/blockfactory/block/block52.json deleted file mode 100644 index 5102751..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block52.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block52", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"W4", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block520.json b/uml2es/examples/blockFactory/data/blockfactory/block/block520.json deleted file mode 100644 index 87a91ec..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block520.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block520", "length":5, "width":3, "height":1, "mass":0.75, "colorCode":"E01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block521.json b/uml2es/examples/blockFactory/data/blockfactory/block/block521.json deleted file mode 100644 index 7f3a4a7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block521.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block521", "length":3, "width":4, "height":3, "mass":1.8, "colorCode":"G17", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block522.json b/uml2es/examples/blockFactory/data/blockfactory/block/block522.json deleted file mode 100644 index 59aeefa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block522.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block522", "length":5, "width":1, "height":1, "mass":1, "colorCode":"N2", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block523.json b/uml2es/examples/blockFactory/data/blockfactory/block/block523.json deleted file mode 100644 index e49d4f5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block523.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block523", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"YR12", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block524.json b/uml2es/examples/blockFactory/data/blockfactory/block/block524.json deleted file mode 100644 index 1e29ef4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block524.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block524", "length":3, "width":2, "height":3, "mass":0.9, "colorCode":"YR0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block525.json b/uml2es/examples/blockFactory/data/blockfactory/block/block525.json deleted file mode 100644 index 524b15a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block525.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block525", "length":5, "width":5, "height":5, "mass":25, "colorCode":"B91", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block526.json b/uml2es/examples/blockFactory/data/blockfactory/block/block526.json deleted file mode 100644 index 02fb77f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block526.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block526", "length":2, "width":2, "height":4, "mass":3.2, "colorCode":"BG75", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block527.json b/uml2es/examples/blockFactory/data/blockfactory/block/block527.json deleted file mode 100644 index 0fe99f8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block527.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block527", "length":4, "width":3, "height":3, "mass":7.2, "colorCode":"YG67", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block528.json b/uml2es/examples/blockFactory/data/blockfactory/block/block528.json deleted file mode 100644 index 64e53f9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block528.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block528", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"E34", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block529.json b/uml2es/examples/blockFactory/data/blockfactory/block/block529.json deleted file mode 100644 index 06c3654..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block529.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block529", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"YG91", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block53.json b/uml2es/examples/blockFactory/data/blockfactory/block/block53.json deleted file mode 100644 index c89dad3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block53.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block53", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"T0", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block530.json b/uml2es/examples/blockFactory/data/blockfactory/block/block530.json deleted file mode 100644 index 4c41deb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block530.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block530", "length":2, "width":5, "height":4, "mass":8, "colorCode":"YR68", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block531.json b/uml2es/examples/blockFactory/data/blockfactory/block/block531.json deleted file mode 100644 index 6b53478..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block531.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block531", "length":5, "width":5, "height":3, "mass":15, "colorCode":"T1", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block532.json b/uml2es/examples/blockFactory/data/blockfactory/block/block532.json deleted file mode 100644 index 626d8d1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block532.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block532", "length":2, "width":3, "height":4, "mass":4.8, "colorCode":"G12", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block533.json b/uml2es/examples/blockFactory/data/blockfactory/block/block533.json deleted file mode 100644 index a6d44a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block533.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block533", "length":1, "width":1, "height":2, "mass":0.4, "colorCode":"BV0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block534.json b/uml2es/examples/blockFactory/data/blockfactory/block/block534.json deleted file mode 100644 index f523211..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block534.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block534", "length":5, "width":4, "height":1, "mass":1, "colorCode":"E77", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block535.json b/uml2es/examples/blockFactory/data/blockfactory/block/block535.json deleted file mode 100644 index d55e749..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block535.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block535", "length":3, "width":5, "height":2, "mass":6, "colorCode":"V04", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block536.json b/uml2es/examples/blockFactory/data/blockfactory/block/block536.json deleted file mode 100644 index c0d29c2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block536.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block536", "length":2, "width":1, "height":3, "mass":1.2, "colorCode":"YG97", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block537.json b/uml2es/examples/blockFactory/data/blockfactory/block/block537.json deleted file mode 100644 index 607a250..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block537.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block537", "length":2, "width":3, "height":1, "mass":1.2, "colorCode":"V93", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block538.json b/uml2es/examples/blockFactory/data/blockfactory/block/block538.json deleted file mode 100644 index 87df3c2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block538.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block538", "length":3, "width":1, "height":5, "mass":3, "colorCode":"BV29", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block539.json b/uml2es/examples/blockFactory/data/blockfactory/block/block539.json deleted file mode 100644 index 573ca86..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block539.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block539", "length":5, "width":5, "height":4, "mass":20, "colorCode":"RV06", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block54.json b/uml2es/examples/blockFactory/data/blockfactory/block/block54.json deleted file mode 100644 index d9593d8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block54.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block54", "length":2, "width":5, "height":5, "mass":10, "colorCode":"RV02", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block540.json b/uml2es/examples/blockFactory/data/blockfactory/block/block540.json deleted file mode 100644 index 535ab1c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block540.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block540", "length":2, "width":1, "height":3, "mass":0.3, "colorCode":"W6", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block541.json b/uml2es/examples/blockFactory/data/blockfactory/block/block541.json deleted file mode 100644 index a65b291..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block541.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block541", "length":5, "width":3, "height":2, "mass":6, "colorCode":"B99", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block542.json b/uml2es/examples/blockFactory/data/blockfactory/block/block542.json deleted file mode 100644 index b45838b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block542.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block542", "length":4, "width":2, "height":3, "mass":1.2, "colorCode":"Y000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block543.json b/uml2es/examples/blockFactory/data/blockfactory/block/block543.json deleted file mode 100644 index f381919..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block543.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block543", "length":2, "width":2, "height":3, "mass":0.6, "colorCode":"T2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block544.json b/uml2es/examples/blockFactory/data/blockfactory/block/block544.json deleted file mode 100644 index f2525d8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block544.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block544", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"C2", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block545.json b/uml2es/examples/blockFactory/data/blockfactory/block/block545.json deleted file mode 100644 index e2af879..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block545.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block545", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"T8", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block546.json b/uml2es/examples/blockFactory/data/blockfactory/block/block546.json deleted file mode 100644 index d6e2401..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block546.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block546", "length":5, "width":1, "height":1, "mass":1, "colorCode":"Y19", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block547.json b/uml2es/examples/blockFactory/data/blockfactory/block/block547.json deleted file mode 100644 index a02b18f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block547.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block547", "length":5, "width":3, "height":5, "mass":15, "colorCode":"E25", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block548.json b/uml2es/examples/blockFactory/data/blockfactory/block/block548.json deleted file mode 100644 index 1cd9ef5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block548.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block548", "length":4, "width":1, "height":3, "mass":0.6, "colorCode":"N9", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block549.json b/uml2es/examples/blockFactory/data/blockfactory/block/block549.json deleted file mode 100644 index f201b94..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block549.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block549", "length":1, "width":5, "height":5, "mass":5, "colorCode":"W10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block55.json b/uml2es/examples/blockFactory/data/blockfactory/block/block55.json deleted file mode 100644 index f1aeff3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block55.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block55", "length":4, "width":4, "height":2, "mass":1.6, "colorCode":"BG07", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block550.json b/uml2es/examples/blockFactory/data/blockfactory/block/block550.json deleted file mode 100644 index 9c3377a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block550.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block550", "length":1, "width":5, "height":3, "mass":3, "colorCode":"G28", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block551.json b/uml2es/examples/blockFactory/data/blockfactory/block/block551.json deleted file mode 100644 index 90fe7f9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block551.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block551", "length":1, "width":4, "height":1, "mass":0.8, "colorCode":"T10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block552.json b/uml2es/examples/blockFactory/data/blockfactory/block/block552.json deleted file mode 100644 index c312e70..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block552.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block552", "length":1, "width":5, "height":2, "mass":2, "colorCode":"R83", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block553.json b/uml2es/examples/blockFactory/data/blockfactory/block/block553.json deleted file mode 100644 index d12c828..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block553.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block553", "length":2, "width":3, "height":4, "mass":4.8, "colorCode":"B000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block554.json b/uml2es/examples/blockFactory/data/blockfactory/block/block554.json deleted file mode 100644 index e52de33..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block554.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block554", "length":5, "width":4, "height":3, "mass":3, "colorCode":"G29", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block555.json b/uml2es/examples/blockFactory/data/blockfactory/block/block555.json deleted file mode 100644 index 4b4a661..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block555.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block555", "length":3, "width":2, "height":5, "mass":1.5, "colorCode":"Y21", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block556.json b/uml2es/examples/blockFactory/data/blockfactory/block/block556.json deleted file mode 100644 index 153a4b6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block556.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block556", "length":3, "width":2, "height":4, "mass":4.8, "colorCode":"B00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block557.json b/uml2es/examples/blockFactory/data/blockfactory/block/block557.json deleted file mode 100644 index 08d1565..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block557.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block557", "length":2, "width":4, "height":5, "mass":8, "colorCode":"B34", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block558.json b/uml2es/examples/blockFactory/data/blockfactory/block/block558.json deleted file mode 100644 index ebac02d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block558.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block558", "length":5, "width":1, "height":5, "mass":5, "colorCode":"G29", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block559.json b/uml2es/examples/blockFactory/data/blockfactory/block/block559.json deleted file mode 100644 index 24aa524..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block559.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block559", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"E39", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block56.json b/uml2es/examples/blockFactory/data/blockfactory/block/block56.json deleted file mode 100644 index 3e2f58c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block56.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block56", "length":2, "width":5, "height":3, "mass":6, "colorCode":"E37", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block560.json b/uml2es/examples/blockFactory/data/blockfactory/block/block560.json deleted file mode 100644 index 7b5ce39..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block560.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block560", "length":3, "width":2, "height":1, "mass":1.2, "colorCode":"B16", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block561.json b/uml2es/examples/blockFactory/data/blockfactory/block/block561.json deleted file mode 100644 index feaf659..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block561.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block561", "length":4, "width":1, "height":2, "mass":1.6, "colorCode":"V01", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block562.json b/uml2es/examples/blockFactory/data/blockfactory/block/block562.json deleted file mode 100644 index 5ba1e30..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block562.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block562", "length":4, "width":1, "height":3, "mass":2.4, "colorCode":"BV34", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block563.json b/uml2es/examples/blockFactory/data/blockfactory/block/block563.json deleted file mode 100644 index eec5194..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block563.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block563", "length":4, "width":3, "height":1, "mass":2.4, "colorCode":"YG07", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block564.json b/uml2es/examples/blockFactory/data/blockfactory/block/block564.json deleted file mode 100644 index 073256a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block564.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block564", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"E34", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block565.json b/uml2es/examples/blockFactory/data/blockfactory/block/block565.json deleted file mode 100644 index a008598..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block565.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block565", "length":3, "width":4, "height":3, "mass":1.8, "colorCode":"E51", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block566.json b/uml2es/examples/blockFactory/data/blockfactory/block/block566.json deleted file mode 100644 index e2836ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block566.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block566", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"YR00", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block567.json b/uml2es/examples/blockFactory/data/blockfactory/block/block567.json deleted file mode 100644 index 4669468..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block567.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block567", "length":5, "width":1, "height":4, "mass":4, "colorCode":"YR00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block568.json b/uml2es/examples/blockFactory/data/blockfactory/block/block568.json deleted file mode 100644 index cd4ca58..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block568.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block568", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"G03", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block569.json b/uml2es/examples/blockFactory/data/blockfactory/block/block569.json deleted file mode 100644 index 65e28fa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block569.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block569", "length":5, "width":5, "height":1, "mass":5, "colorCode":"Y32", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block57.json b/uml2es/examples/blockFactory/data/blockfactory/block/block57.json deleted file mode 100644 index f551cc4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block57.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block57", "length":5, "width":1, "height":1, "mass":1, "colorCode":"YR07", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block570.json b/uml2es/examples/blockFactory/data/blockfactory/block/block570.json deleted file mode 100644 index a20471d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block570.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block570", "length":2, "width":5, "height":4, "mass":8, "colorCode":"RV63", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block571.json b/uml2es/examples/blockFactory/data/blockfactory/block/block571.json deleted file mode 100644 index 6357bc2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block571.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block571", "length":1, "width":5, "height":3, "mass":0.75, "colorCode":"FRV1", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block572.json b/uml2es/examples/blockFactory/data/blockfactory/block/block572.json deleted file mode 100644 index 9674cf3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block572.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block572", "length":4, "width":3, "height":4, "mass":2.4, "colorCode":"W10", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block573.json b/uml2es/examples/blockFactory/data/blockfactory/block/block573.json deleted file mode 100644 index 3c95bb6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block573.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block573", "length":4, "width":4, "height":3, "mass":9.6, "colorCode":"YG09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block574.json b/uml2es/examples/blockFactory/data/blockfactory/block/block574.json deleted file mode 100644 index 011e693..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block574.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block574", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"Y06", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block575.json b/uml2es/examples/blockFactory/data/blockfactory/block/block575.json deleted file mode 100644 index a936667..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block575.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block575", "length":5, "width":1, "height":3, "mass":0.75, "colorCode":"R21", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block576.json b/uml2es/examples/blockFactory/data/blockfactory/block/block576.json deleted file mode 100644 index 2d65672..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block576.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block576", "length":5, "width":3, "height":2, "mass":1.5, "colorCode":"E74", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block577.json b/uml2es/examples/blockFactory/data/blockfactory/block/block577.json deleted file mode 100644 index 918a5da..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block577.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block577", "length":4, "width":5, "height":5, "mass":20, "colorCode":"FV2", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block578.json b/uml2es/examples/blockFactory/data/blockfactory/block/block578.json deleted file mode 100644 index ee4faf5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block578.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block578", "length":4, "width":3, "height":1, "mass":2.4, "colorCode":"V99", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block579.json b/uml2es/examples/blockFactory/data/blockfactory/block/block579.json deleted file mode 100644 index e9e7c81..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block579.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block579", "length":1, "width":4, "height":3, "mass":2.4, "colorCode":"R35", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block58.json b/uml2es/examples/blockFactory/data/blockfactory/block/block58.json deleted file mode 100644 index 36f3db0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block58.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block58", "length":5, "width":1, "height":4, "mass":4, "colorCode":"W7", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block580.json b/uml2es/examples/blockFactory/data/blockfactory/block/block580.json deleted file mode 100644 index a1f1374..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block580.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block580", "length":4, "width":5, "height":4, "mass":16, "colorCode":"YR0000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block581.json b/uml2es/examples/blockFactory/data/blockfactory/block/block581.json deleted file mode 100644 index d4cfdd2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block581.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block581", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"T1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block582.json b/uml2es/examples/blockFactory/data/blockfactory/block/block582.json deleted file mode 100644 index 71fdb77..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block582.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block582", "length":4, "width":3, "height":2, "mass":4.8, "colorCode":"G17", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block583.json b/uml2es/examples/blockFactory/data/blockfactory/block/block583.json deleted file mode 100644 index 6696100..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block583.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block583", "length":4, "width":1, "height":3, "mass":2.4, "colorCode":"YR23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block584.json b/uml2es/examples/blockFactory/data/blockfactory/block/block584.json deleted file mode 100644 index 387db52..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block584.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block584", "length":5, "width":2, "height":1, "mass":2, "colorCode":"RV66", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block585.json b/uml2es/examples/blockFactory/data/blockfactory/block/block585.json deleted file mode 100644 index a1bd2de..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block585.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block585", "length":2, "width":3, "height":2, "mass":0.6, "colorCode":"Y21", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block586.json b/uml2es/examples/blockFactory/data/blockfactory/block/block586.json deleted file mode 100644 index a4dd805..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block586.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block586", "length":4, "width":1, "height":4, "mass":3.2, "colorCode":"B16", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block587.json b/uml2es/examples/blockFactory/data/blockfactory/block/block587.json deleted file mode 100644 index 55a856a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block587.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block587", "length":2, "width":1, "height":5, "mass":0.5, "colorCode":"RV55", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block588.json b/uml2es/examples/blockFactory/data/blockfactory/block/block588.json deleted file mode 100644 index 27ca54e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block588.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block588", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"B00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block589.json b/uml2es/examples/blockFactory/data/blockfactory/block/block589.json deleted file mode 100644 index 177af06..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block589.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block589", "length":2, "width":2, "height":5, "mass":4, "colorCode":"V25", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block59.json b/uml2es/examples/blockFactory/data/blockfactory/block/block59.json deleted file mode 100644 index 6a67e66..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block59.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block59", "length":3, "width":5, "height":1, "mass":3, "colorCode":"R27", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block590.json b/uml2es/examples/blockFactory/data/blockfactory/block/block590.json deleted file mode 100644 index 9ff70fa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block590.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block590", "length":3, "width":2, "height":3, "mass":3.6, "colorCode":"Y08", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block591.json b/uml2es/examples/blockFactory/data/blockfactory/block/block591.json deleted file mode 100644 index 5e910c1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block591.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block591", "length":5, "width":4, "height":4, "mass":16, "colorCode":"C1", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block592.json b/uml2es/examples/blockFactory/data/blockfactory/block/block592.json deleted file mode 100644 index aae694f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block592.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block592", "length":5, "width":4, "height":1, "mass":4, "colorCode":"RV95", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block593.json b/uml2es/examples/blockFactory/data/blockfactory/block/block593.json deleted file mode 100644 index 74ffeb3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block593.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block593", "length":4, "width":5, "height":4, "mass":16, "colorCode":"W0", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block594.json b/uml2es/examples/blockFactory/data/blockfactory/block/block594.json deleted file mode 100644 index e95c0df..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block594.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block594", "length":3, "width":4, "height":1, "mass":2.4, "colorCode":"YR04", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block595.json b/uml2es/examples/blockFactory/data/blockfactory/block/block595.json deleted file mode 100644 index 8bb467a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block595.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block595", "length":5, "width":1, "height":2, "mass":2, "colorCode":"E70", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block596.json b/uml2es/examples/blockFactory/data/blockfactory/block/block596.json deleted file mode 100644 index 28372c2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block596.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block596", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"B37", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block597.json b/uml2es/examples/blockFactory/data/blockfactory/block/block597.json deleted file mode 100644 index fb030eb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block597.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block597", "length":5, "width":1, "height":1, "mass":1, "colorCode":"YR65", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block598.json b/uml2es/examples/blockFactory/data/blockfactory/block/block598.json deleted file mode 100644 index 5579540..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block598.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block598", "length":5, "width":1, "height":1, "mass":1, "colorCode":"C6", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block599.json b/uml2es/examples/blockFactory/data/blockfactory/block/block599.json deleted file mode 100644 index d43f093..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block599.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block599", "length":5, "width":1, "height":5, "mass":5, "colorCode":"E34", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block6.json b/uml2es/examples/blockFactory/data/blockfactory/block/block6.json deleted file mode 100644 index eb38cbc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block6.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block6", "length":2, "width":5, "height":1, "mass":0.5, "colorCode":"B23", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block60.json b/uml2es/examples/blockFactory/data/blockfactory/block/block60.json deleted file mode 100644 index 71d8d81..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block60.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block60", "length":2, "width":2, "height":3, "mass":2.4, "colorCode":"BG15", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block600.json b/uml2es/examples/blockFactory/data/blockfactory/block/block600.json deleted file mode 100644 index 4e34e17..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block600.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block600", "length":5, "width":3, "height":2, "mass":1.5, "colorCode":"YR01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block601.json b/uml2es/examples/blockFactory/data/blockfactory/block/block601.json deleted file mode 100644 index ed373f7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block601.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block601", "length":4, "width":2, "height":3, "mass":4.8, "colorCode":"B29", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block602.json b/uml2es/examples/blockFactory/data/blockfactory/block/block602.json deleted file mode 100644 index c49f352..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block602.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block602", "length":4, "width":5, "height":5, "mass":20, "colorCode":"BG07", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block603.json b/uml2es/examples/blockFactory/data/blockfactory/block/block603.json deleted file mode 100644 index c1ddcdc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block603.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block603", "length":4, "width":3, "height":4, "mass":9.6, "colorCode":"V28", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block604.json b/uml2es/examples/blockFactory/data/blockfactory/block/block604.json deleted file mode 100644 index a381573..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block604.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block604", "length":2, "width":5, "height":4, "mass":2, "colorCode":"YR30", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block605.json b/uml2es/examples/blockFactory/data/blockfactory/block/block605.json deleted file mode 100644 index 1db72e5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block605.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block605", "length":4, "width":3, "height":4, "mass":9.6, "colorCode":"Y21", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block606.json b/uml2es/examples/blockFactory/data/blockfactory/block/block606.json deleted file mode 100644 index 45f7f9d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block606.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block606", "length":1, "width":3, "height":4, "mass":2.4, "colorCode":"BV31", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block607.json b/uml2es/examples/blockFactory/data/blockfactory/block/block607.json deleted file mode 100644 index 0cb9c6a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block607.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block607", "length":2, "width":3, "height":3, "mass":0.9, "colorCode":"G24", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block608.json b/uml2es/examples/blockFactory/data/blockfactory/block/block608.json deleted file mode 100644 index 927e806..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block608.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block608", "length":5, "width":1, "height":1, "mass":1, "colorCode":"R39", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block609.json b/uml2es/examples/blockFactory/data/blockfactory/block/block609.json deleted file mode 100644 index b7541d0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block609.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block609", "length":4, "width":2, "height":3, "mass":4.8, "colorCode":"G94", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block61.json b/uml2es/examples/blockFactory/data/blockfactory/block/block61.json deleted file mode 100644 index c76a534..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block61.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block61", "length":2, "width":2, "height":3, "mass":2.4, "colorCode":"YR23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block610.json b/uml2es/examples/blockFactory/data/blockfactory/block/block610.json deleted file mode 100644 index 5d1ad5b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block610.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block610", "length":5, "width":3, "height":2, "mass":6, "colorCode":"BG01", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block611.json b/uml2es/examples/blockFactory/data/blockfactory/block/block611.json deleted file mode 100644 index 60c0d57..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block611.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block611", "length":1, "width":3, "height":5, "mass":3, "colorCode":"YG05", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block612.json b/uml2es/examples/blockFactory/data/blockfactory/block/block612.json deleted file mode 100644 index a9a5433..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block612.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block612", "length":4, "width":5, "height":1, "mass":1, "colorCode":"E0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block613.json b/uml2es/examples/blockFactory/data/blockfactory/block/block613.json deleted file mode 100644 index 73e0cb5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block613.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block613", "length":2, "width":5, "height":5, "mass":10, "colorCode":"RV93", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block614.json b/uml2es/examples/blockFactory/data/blockfactory/block/block614.json deleted file mode 100644 index 70e2bab..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block614.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block614", "length":4, "width":1, "height":5, "mass":4, "colorCode":"W7", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block615.json b/uml2es/examples/blockFactory/data/blockfactory/block/block615.json deleted file mode 100644 index 5fbf3fe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block615.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block615", "length":4, "width":2, "height":4, "mass":6.4, "colorCode":"E70", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block616.json b/uml2es/examples/blockFactory/data/blockfactory/block/block616.json deleted file mode 100644 index ddceb21..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block616.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block616", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"R32", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block617.json b/uml2es/examples/blockFactory/data/blockfactory/block/block617.json deleted file mode 100644 index 1a1ff0c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block617.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block617", "length":1, "width":4, "height":2, "mass":1.6, "colorCode":"C5", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block618.json b/uml2es/examples/blockFactory/data/blockfactory/block/block618.json deleted file mode 100644 index ea5b6c8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block618.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block618", "length":2, "width":4, "height":5, "mass":8, "colorCode":"E84", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block619.json b/uml2es/examples/blockFactory/data/blockfactory/block/block619.json deleted file mode 100644 index 4a2eeff..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block619.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block619", "length":2, "width":1, "height":1, "mass":0.1, "colorCode":"E01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block62.json b/uml2es/examples/blockFactory/data/blockfactory/block/block62.json deleted file mode 100644 index 018275d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block62.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block62", "length":3, "width":5, "height":3, "mass":2.25, "colorCode":"BV04", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block620.json b/uml2es/examples/blockFactory/data/blockfactory/block/block620.json deleted file mode 100644 index df899a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block620.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block620", "length":4, "width":2, "height":5, "mass":2, "colorCode":"YG05", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block621.json b/uml2es/examples/blockFactory/data/blockfactory/block/block621.json deleted file mode 100644 index fd2f30d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block621.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block621", "length":4, "width":5, "height":4, "mass":4, "colorCode":"G46", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block622.json b/uml2es/examples/blockFactory/data/blockfactory/block/block622.json deleted file mode 100644 index b7d64d3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block622.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block622", "length":1, "width":4, "height":4, "mass":3.2, "colorCode":"R20", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block623.json b/uml2es/examples/blockFactory/data/blockfactory/block/block623.json deleted file mode 100644 index 9399771..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block623.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block623", "length":4, "width":4, "height":4, "mass":3.2, "colorCode":"C8", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block624.json b/uml2es/examples/blockFactory/data/blockfactory/block/block624.json deleted file mode 100644 index 91c849e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block624.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block624", "length":2, "width":5, "height":1, "mass":2, "colorCode":"G16", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block625.json b/uml2es/examples/blockFactory/data/blockfactory/block/block625.json deleted file mode 100644 index 02461eb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block625.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block625", "length":2, "width":1, "height":3, "mass":1.2, "colorCode":"T1", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block626.json b/uml2es/examples/blockFactory/data/blockfactory/block/block626.json deleted file mode 100644 index d4f2ddf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block626.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block626", "length":3, "width":5, "height":4, "mass":3, "colorCode":"FV2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block627.json b/uml2es/examples/blockFactory/data/blockfactory/block/block627.json deleted file mode 100644 index 951ce98..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block627.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block627", "length":4, "width":5, "height":1, "mass":4, "colorCode":"YR21", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block628.json b/uml2es/examples/blockFactory/data/blockfactory/block/block628.json deleted file mode 100644 index 8ad0248..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block628.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block628", "length":2, "width":4, "height":1, "mass":1.6, "colorCode":"RV11", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block629.json b/uml2es/examples/blockFactory/data/blockfactory/block/block629.json deleted file mode 100644 index df99ce2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block629.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block629", "length":4, "width":1, "height":2, "mass":0.4, "colorCode":"Y0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block63.json b/uml2es/examples/blockFactory/data/blockfactory/block/block63.json deleted file mode 100644 index cf99ee7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block63.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block63", "length":1, "width":3, "height":2, "mass":0.3, "colorCode":"E93", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block630.json b/uml2es/examples/blockFactory/data/blockfactory/block/block630.json deleted file mode 100644 index 545a1d3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block630.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block630", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"RV10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block631.json b/uml2es/examples/blockFactory/data/blockfactory/block/block631.json deleted file mode 100644 index 1384dbd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block631.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block631", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"G20", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block632.json b/uml2es/examples/blockFactory/data/blockfactory/block/block632.json deleted file mode 100644 index 87eaf98..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block632.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block632", "length":3, "width":5, "height":3, "mass":9, "colorCode":"R30", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block633.json b/uml2es/examples/blockFactory/data/blockfactory/block/block633.json deleted file mode 100644 index f8ce56b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block633.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block633", "length":4, "width":4, "height":5, "mass":16, "colorCode":"110", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block634.json b/uml2es/examples/blockFactory/data/blockfactory/block/block634.json deleted file mode 100644 index a97bf6b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block634.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block634", "length":2, "width":1, "height":5, "mass":0.5, "colorCode":"G12", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block635.json b/uml2es/examples/blockFactory/data/blockfactory/block/block635.json deleted file mode 100644 index 6421f8b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block635.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block635", "length":2, "width":3, "height":1, "mass":1.2, "colorCode":"R01", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block636.json b/uml2es/examples/blockFactory/data/blockfactory/block/block636.json deleted file mode 100644 index 75585a7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block636.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block636", "length":2, "width":5, "height":2, "mass":4, "colorCode":"E23", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block637.json b/uml2es/examples/blockFactory/data/blockfactory/block/block637.json deleted file mode 100644 index 578d69d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block637.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block637", "length":2, "width":1, "height":4, "mass":0.4, "colorCode":"T10", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block638.json b/uml2es/examples/blockFactory/data/blockfactory/block/block638.json deleted file mode 100644 index 0b5268b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block638.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block638", "length":2, "width":2, "height":1, "mass":0.8, "colorCode":"B97", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block639.json b/uml2es/examples/blockFactory/data/blockfactory/block/block639.json deleted file mode 100644 index 65df1a7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block639.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block639", "length":2, "width":2, "height":5, "mass":4, "colorCode":"R37", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block64.json b/uml2es/examples/blockFactory/data/blockfactory/block/block64.json deleted file mode 100644 index b3e094b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block64.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block64", "length":5, "width":5, "height":3, "mass":15, "colorCode":"E15", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block640.json b/uml2es/examples/blockFactory/data/blockfactory/block/block640.json deleted file mode 100644 index 9bf1fb5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block640.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block640", "length":5, "width":5, "height":3, "mass":15, "colorCode":"110", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block641.json b/uml2es/examples/blockFactory/data/blockfactory/block/block641.json deleted file mode 100644 index 73f917b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block641.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block641", "length":1, "width":4, "height":4, "mass":3.2, "colorCode":"T3", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block642.json b/uml2es/examples/blockFactory/data/blockfactory/block/block642.json deleted file mode 100644 index 1d349fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block642.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block642", "length":5, "width":5, "height":4, "mass":20, "colorCode":"Y02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block643.json b/uml2es/examples/blockFactory/data/blockfactory/block/block643.json deleted file mode 100644 index fc74166..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block643.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block643", "length":4, "width":5, "height":5, "mass":20, "colorCode":"G16", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block644.json b/uml2es/examples/blockFactory/data/blockfactory/block/block644.json deleted file mode 100644 index f3656a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block644.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block644", "length":4, "width":1, "height":3, "mass":2.4, "colorCode":"BG78", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block645.json b/uml2es/examples/blockFactory/data/blockfactory/block/block645.json deleted file mode 100644 index d04eb9a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block645.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block645", "length":1, "width":2, "height":5, "mass":2, "colorCode":"E87", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block646.json b/uml2es/examples/blockFactory/data/blockfactory/block/block646.json deleted file mode 100644 index 6ac6431..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block646.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block646", "length":3, "width":2, "height":5, "mass":1.5, "colorCode":"W7", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block647.json b/uml2es/examples/blockFactory/data/blockfactory/block/block647.json deleted file mode 100644 index 4b5d74d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block647.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block647", "length":2, "width":2, "height":2, "mass":1.6, "colorCode":"YG67", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block648.json b/uml2es/examples/blockFactory/data/blockfactory/block/block648.json deleted file mode 100644 index eb50cf0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block648.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block648", "length":2, "width":3, "height":5, "mass":6, "colorCode":"BG72", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block649.json b/uml2es/examples/blockFactory/data/blockfactory/block/block649.json deleted file mode 100644 index 24212e4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block649.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block649", "length":3, "width":4, "height":2, "mass":1.2, "colorCode":"B05", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block65.json b/uml2es/examples/blockFactory/data/blockfactory/block/block65.json deleted file mode 100644 index 440e712..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block65.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block65", "length":1, "width":2, "height":3, "mass":0.3, "colorCode":"B97", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block650.json b/uml2es/examples/blockFactory/data/blockfactory/block/block650.json deleted file mode 100644 index e892196..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block650.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block650", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"E93", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block651.json b/uml2es/examples/blockFactory/data/blockfactory/block/block651.json deleted file mode 100644 index 77426a9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block651.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block651", "length":3, "width":3, "height":1, "mass":0.45, "colorCode":"C1", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block652.json b/uml2es/examples/blockFactory/data/blockfactory/block/block652.json deleted file mode 100644 index f5001ae..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block652.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block652", "length":4, "width":1, "height":4, "mass":3.2, "colorCode":"YR14", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block653.json b/uml2es/examples/blockFactory/data/blockfactory/block/block653.json deleted file mode 100644 index ae3960b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block653.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block653", "length":4, "width":3, "height":4, "mass":9.6, "colorCode":"BG0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block654.json b/uml2es/examples/blockFactory/data/blockfactory/block/block654.json deleted file mode 100644 index fef2a7e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block654.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block654", "length":1, "width":1, "height":3, "mass":0.6, "colorCode":"W1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block655.json b/uml2es/examples/blockFactory/data/blockfactory/block/block655.json deleted file mode 100644 index 6021734..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block655.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block655", "length":1, "width":4, "height":3, "mass":2.4, "colorCode":"R37", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block656.json b/uml2es/examples/blockFactory/data/blockfactory/block/block656.json deleted file mode 100644 index 0b05152..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block656.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block656", "length":1, "width":5, "height":1, "mass":1, "colorCode":"YG00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block657.json b/uml2es/examples/blockFactory/data/blockfactory/block/block657.json deleted file mode 100644 index 01b6b4f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block657.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block657", "length":3, "width":2, "height":4, "mass":1.2, "colorCode":"Y04", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block658.json b/uml2es/examples/blockFactory/data/blockfactory/block/block658.json deleted file mode 100644 index b42e27d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block658.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block658", "length":4, "width":2, "height":4, "mass":6.4, "colorCode":"BG18", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block659.json b/uml2es/examples/blockFactory/data/blockfactory/block/block659.json deleted file mode 100644 index f92bb33..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block659.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block659", "length":4, "width":5, "height":2, "mass":8, "colorCode":"G05", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block66.json b/uml2es/examples/blockFactory/data/blockfactory/block/block66.json deleted file mode 100644 index 2b05084..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block66.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block66", "length":2, "width":3, "height":5, "mass":1.5, "colorCode":"N3", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block660.json b/uml2es/examples/blockFactory/data/blockfactory/block/block660.json deleted file mode 100644 index b571737..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block660.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block660", "length":2, "width":4, "height":5, "mass":8, "colorCode":"Y15", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block661.json b/uml2es/examples/blockFactory/data/blockfactory/block/block661.json deleted file mode 100644 index eb60c6a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block661.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block661", "length":5, "width":5, "height":5, "mass":25, "colorCode":"V17", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block662.json b/uml2es/examples/blockFactory/data/blockfactory/block/block662.json deleted file mode 100644 index 333be2c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block662.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block662", "length":5, "width":4, "height":4, "mass":4, "colorCode":"E53", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block663.json b/uml2es/examples/blockFactory/data/blockfactory/block/block663.json deleted file mode 100644 index e228b64..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block663.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block663", "length":4, "width":5, "height":5, "mass":5, "colorCode":"RV29", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block664.json b/uml2es/examples/blockFactory/data/blockfactory/block/block664.json deleted file mode 100644 index 4606d0e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block664.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block664", "length":2, "width":3, "height":2, "mass":2.4, "colorCode":"R89", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block665.json b/uml2es/examples/blockFactory/data/blockfactory/block/block665.json deleted file mode 100644 index 3a2fdb2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block665.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block665", "length":1, "width":2, "height":5, "mass":2, "colorCode":"R37", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block666.json b/uml2es/examples/blockFactory/data/blockfactory/block/block666.json deleted file mode 100644 index 9025fd9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block666.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block666", "length":2, "width":1, "height":4, "mass":1.6, "colorCode":"E34", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block667.json b/uml2es/examples/blockFactory/data/blockfactory/block/block667.json deleted file mode 100644 index a293b43..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block667.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block667", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"BG10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block668.json b/uml2es/examples/blockFactory/data/blockfactory/block/block668.json deleted file mode 100644 index cc2259b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block668.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block668", "length":1, "width":4, "height":1, "mass":0.8, "colorCode":"FYG1", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block669.json b/uml2es/examples/blockFactory/data/blockfactory/block/block669.json deleted file mode 100644 index 2b2e76e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block669.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block669", "length":2, "width":1, "height":2, "mass":0.8, "colorCode":"C00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block67.json b/uml2es/examples/blockFactory/data/blockfactory/block/block67.json deleted file mode 100644 index e5bb7f8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block67.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block67", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"E23", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block670.json b/uml2es/examples/blockFactory/data/blockfactory/block/block670.json deleted file mode 100644 index 9422c2d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block670.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block670", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"E84", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block671.json b/uml2es/examples/blockFactory/data/blockfactory/block/block671.json deleted file mode 100644 index d90d653..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block671.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block671", "length":4, "width":2, "height":5, "mass":8, "colorCode":"BV00", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block672.json b/uml2es/examples/blockFactory/data/blockfactory/block/block672.json deleted file mode 100644 index 035add1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block672.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block672", "length":5, "width":1, "height":5, "mass":5, "colorCode":"RV69", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block673.json b/uml2es/examples/blockFactory/data/blockfactory/block/block673.json deleted file mode 100644 index 410c115..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block673.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block673", "length":5, "width":4, "height":3, "mass":12, "colorCode":"YR000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block674.json b/uml2es/examples/blockFactory/data/blockfactory/block/block674.json deleted file mode 100644 index aef2ba3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block674.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block674", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"RV17", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block675.json b/uml2es/examples/blockFactory/data/blockfactory/block/block675.json deleted file mode 100644 index 94b051a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block675.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block675", "length":3, "width":4, "height":4, "mass":9.6, "colorCode":"W9", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block676.json b/uml2es/examples/blockFactory/data/blockfactory/block/block676.json deleted file mode 100644 index b51d84c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block676.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block676", "length":5, "width":3, "height":2, "mass":1.5, "colorCode":"V93", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block677.json b/uml2es/examples/blockFactory/data/blockfactory/block/block677.json deleted file mode 100644 index aa596fe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block677.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block677", "length":1, "width":1, "height":5, "mass":1, "colorCode":"YG06", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block678.json b/uml2es/examples/blockFactory/data/blockfactory/block/block678.json deleted file mode 100644 index 50ac90e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block678.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block678", "length":3, "width":4, "height":2, "mass":1.2, "colorCode":"N2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block679.json b/uml2es/examples/blockFactory/data/blockfactory/block/block679.json deleted file mode 100644 index 6b77f76..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block679.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block679", "length":3, "width":3, "height":1, "mass":1.8, "colorCode":"E15", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block68.json b/uml2es/examples/blockFactory/data/blockfactory/block/block68.json deleted file mode 100644 index b7cbbc3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block68.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block68", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"E50", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block680.json b/uml2es/examples/blockFactory/data/blockfactory/block/block680.json deleted file mode 100644 index 2aaa295..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block680.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block680", "length":4, "width":1, "height":5, "mass":1, "colorCode":"E43", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block681.json b/uml2es/examples/blockFactory/data/blockfactory/block/block681.json deleted file mode 100644 index 33df0c3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block681.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block681", "length":5, "width":1, "height":4, "mass":4, "colorCode":"R43", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block682.json b/uml2es/examples/blockFactory/data/blockfactory/block/block682.json deleted file mode 100644 index fb3c192..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block682.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block682", "length":4, "width":2, "height":5, "mass":8, "colorCode":"R0000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block683.json b/uml2es/examples/blockFactory/data/blockfactory/block/block683.json deleted file mode 100644 index 6791817..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block683.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block683", "length":1, "width":3, "height":4, "mass":2.4, "colorCode":"Y04", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block684.json b/uml2es/examples/blockFactory/data/blockfactory/block/block684.json deleted file mode 100644 index b6737aa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block684.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block684", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"BV17", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block685.json b/uml2es/examples/blockFactory/data/blockfactory/block/block685.json deleted file mode 100644 index 1737199..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block685.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block685", "length":3, "width":5, "height":2, "mass":1.5, "colorCode":"FV2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block686.json b/uml2es/examples/blockFactory/data/blockfactory/block/block686.json deleted file mode 100644 index 74ecdc8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block686.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block686", "length":3, "width":3, "height":4, "mass":7.2, "colorCode":"B21", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block687.json b/uml2es/examples/blockFactory/data/blockfactory/block/block687.json deleted file mode 100644 index 08d7eb6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block687.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block687", "length":4, "width":5, "height":3, "mass":12, "colorCode":"BV23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block688.json b/uml2es/examples/blockFactory/data/blockfactory/block/block688.json deleted file mode 100644 index a4b4cba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block688.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block688", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"YG00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block689.json b/uml2es/examples/blockFactory/data/blockfactory/block/block689.json deleted file mode 100644 index 45fc2b1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block689.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block689", "length":1, "width":3, "height":2, "mass":0.3, "colorCode":"YG00", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block69.json b/uml2es/examples/blockFactory/data/blockfactory/block/block69.json deleted file mode 100644 index c9be18c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block69.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block69", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"W3", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block690.json b/uml2es/examples/blockFactory/data/blockfactory/block/block690.json deleted file mode 100644 index 7bf35ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block690.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block690", "length":4, "width":4, "height":3, "mass":2.4, "colorCode":"R29", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block691.json b/uml2es/examples/blockFactory/data/blockfactory/block/block691.json deleted file mode 100644 index c563b53..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block691.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block691", "length":4, "width":5, "height":1, "mass":1, "colorCode":"B41", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block692.json b/uml2es/examples/blockFactory/data/blockfactory/block/block692.json deleted file mode 100644 index 6677bc3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block692.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block692", "length":5, "width":1, "height":5, "mass":5, "colorCode":"C00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block693.json b/uml2es/examples/blockFactory/data/blockfactory/block/block693.json deleted file mode 100644 index f9fe023..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block693.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block693", "length":3, "width":3, "height":4, "mass":7.2, "colorCode":"E40", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block694.json b/uml2es/examples/blockFactory/data/blockfactory/block/block694.json deleted file mode 100644 index 3f002ba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block694.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block694", "length":1, "width":4, "height":4, "mass":0.8, "colorCode":"B95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block695.json b/uml2es/examples/blockFactory/data/blockfactory/block/block695.json deleted file mode 100644 index 6b1cabd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block695.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block695", "length":5, "width":3, "height":3, "mass":2.25, "colorCode":"RV69", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block696.json b/uml2es/examples/blockFactory/data/blockfactory/block/block696.json deleted file mode 100644 index 6498490..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block696.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block696", "length":1, "width":5, "height":3, "mass":3, "colorCode":"BG96", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block697.json b/uml2es/examples/blockFactory/data/blockfactory/block/block697.json deleted file mode 100644 index 77c0355..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block697.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block697", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"W8", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block698.json b/uml2es/examples/blockFactory/data/blockfactory/block/block698.json deleted file mode 100644 index 9c1eda4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block698.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block698", "length":5, "width":5, "height":5, "mass":25, "colorCode":"YG99", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block699.json b/uml2es/examples/blockFactory/data/blockfactory/block/block699.json deleted file mode 100644 index 3e354a3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block699.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block699", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"V09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block7.json b/uml2es/examples/blockFactory/data/blockfactory/block/block7.json deleted file mode 100644 index d3cf87f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block7.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block7", "length":1, "width":2, "height":5, "mass":2, "colorCode":"C00", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block70.json b/uml2es/examples/blockFactory/data/blockfactory/block/block70.json deleted file mode 100644 index c3b9aa0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block70.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block70", "length":2, "width":3, "height":1, "mass":1.2, "colorCode":"G14", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block700.json b/uml2es/examples/blockFactory/data/blockfactory/block/block700.json deleted file mode 100644 index 19eb7c1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block700.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block700", "length":2, "width":1, "height":4, "mass":1.6, "colorCode":"R08", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block701.json b/uml2es/examples/blockFactory/data/blockfactory/block/block701.json deleted file mode 100644 index 772d329..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block701.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block701", "length":3, "width":3, "height":1, "mass":1.8, "colorCode":"R29", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block702.json b/uml2es/examples/blockFactory/data/blockfactory/block/block702.json deleted file mode 100644 index fda3406..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block702.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block702", "length":4, "width":4, "height":3, "mass":2.4, "colorCode":"R39", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block703.json b/uml2es/examples/blockFactory/data/blockfactory/block/block703.json deleted file mode 100644 index f1a4529..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block703.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block703", "length":3, "width":1, "height":4, "mass":2.4, "colorCode":"BG57", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block704.json b/uml2es/examples/blockFactory/data/blockfactory/block/block704.json deleted file mode 100644 index 2dacb5c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block704.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block704", "length":5, "width":2, "height":2, "mass":4, "colorCode":"E97", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block705.json b/uml2es/examples/blockFactory/data/blockfactory/block/block705.json deleted file mode 100644 index cc45ea3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block705.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block705", "length":1, "width":3, "height":2, "mass":1.2, "colorCode":"G40", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block706.json b/uml2es/examples/blockFactory/data/blockfactory/block/block706.json deleted file mode 100644 index 777ab88..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block706.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block706", "length":2, "width":5, "height":2, "mass":1, "colorCode":"W9", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block707.json b/uml2es/examples/blockFactory/data/blockfactory/block/block707.json deleted file mode 100644 index ee9ab31..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block707.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block707", "length":3, "width":2, "height":1, "mass":1.2, "colorCode":"G07", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block708.json b/uml2es/examples/blockFactory/data/blockfactory/block/block708.json deleted file mode 100644 index 09cc104..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block708.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block708", "length":1, "width":4, "height":4, "mass":3.2, "colorCode":"YG93", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block709.json b/uml2es/examples/blockFactory/data/blockfactory/block/block709.json deleted file mode 100644 index 98d4511..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block709.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block709", "length":4, "width":4, "height":4, "mass":12.8, "colorCode":"BV23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block71.json b/uml2es/examples/blockFactory/data/blockfactory/block/block71.json deleted file mode 100644 index af26b83..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block71.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block71", "length":3, "width":5, "height":5, "mass":15, "colorCode":"BG05", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block710.json b/uml2es/examples/blockFactory/data/blockfactory/block/block710.json deleted file mode 100644 index 1eb3f01..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block710.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block710", "length":2, "width":5, "height":2, "mass":4, "colorCode":"E89", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block711.json b/uml2es/examples/blockFactory/data/blockfactory/block/block711.json deleted file mode 100644 index f93f2cd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block711.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block711", "length":4, "width":2, "height":1, "mass":0.4, "colorCode":"G85", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block712.json b/uml2es/examples/blockFactory/data/blockfactory/block/block712.json deleted file mode 100644 index 9faa562..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block712.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block712", "length":2, "width":5, "height":1, "mass":2, "colorCode":"Y08", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block713.json b/uml2es/examples/blockFactory/data/blockfactory/block/block713.json deleted file mode 100644 index 6d134ae..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block713.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block713", "length":3, "width":5, "height":4, "mass":3, "colorCode":"B0000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block714.json b/uml2es/examples/blockFactory/data/blockfactory/block/block714.json deleted file mode 100644 index a22552b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block714.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block714", "length":3, "width":2, "height":3, "mass":3.6, "colorCode":"E18", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block715.json b/uml2es/examples/blockFactory/data/blockfactory/block/block715.json deleted file mode 100644 index 34579cc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block715.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block715", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"YG13", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block716.json b/uml2es/examples/blockFactory/data/blockfactory/block/block716.json deleted file mode 100644 index dc27829..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block716.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block716", "length":2, "width":3, "height":1, "mass":1.2, "colorCode":"Y04", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block717.json b/uml2es/examples/blockFactory/data/blockfactory/block/block717.json deleted file mode 100644 index 328011d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block717.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block717", "length":3, "width":4, "height":2, "mass":1.2, "colorCode":"BV17", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block718.json b/uml2es/examples/blockFactory/data/blockfactory/block/block718.json deleted file mode 100644 index 6f1ae52..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block718.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block718", "length":3, "width":3, "height":5, "mass":9, "colorCode":"110", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block719.json b/uml2es/examples/blockFactory/data/blockfactory/block/block719.json deleted file mode 100644 index daf3fd1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block719.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block719", "length":2, "width":1, "height":5, "mass":2, "colorCode":"RV93", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block72.json b/uml2es/examples/blockFactory/data/blockfactory/block/block72.json deleted file mode 100644 index 0457d9f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block72.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block72", "length":3, "width":2, "height":5, "mass":6, "colorCode":"B93", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block720.json b/uml2es/examples/blockFactory/data/blockfactory/block/block720.json deleted file mode 100644 index 0815c8a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block720.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block720", "length":4, "width":2, "height":1, "mass":1.6, "colorCode":"B23", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block721.json b/uml2es/examples/blockFactory/data/blockfactory/block/block721.json deleted file mode 100644 index b81b11b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block721.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block721", "length":1, "width":5, "height":5, "mass":5, "colorCode":"B60", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block722.json b/uml2es/examples/blockFactory/data/blockfactory/block/block722.json deleted file mode 100644 index c5a0046..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block722.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block722", "length":3, "width":3, "height":5, "mass":9, "colorCode":"B60", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block723.json b/uml2es/examples/blockFactory/data/blockfactory/block/block723.json deleted file mode 100644 index 8c106a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block723.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block723", "length":5, "width":1, "height":4, "mass":4, "colorCode":"B37", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block724.json b/uml2es/examples/blockFactory/data/blockfactory/block/block724.json deleted file mode 100644 index 29bf3d6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block724.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block724", "length":3, "width":1, "height":5, "mass":3, "colorCode":"G19", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block725.json b/uml2es/examples/blockFactory/data/blockfactory/block/block725.json deleted file mode 100644 index ddd1d94..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block725.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block725", "length":2, "width":1, "height":3, "mass":1.2, "colorCode":"RV93", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block726.json b/uml2es/examples/blockFactory/data/blockfactory/block/block726.json deleted file mode 100644 index 751173f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block726.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block726", "length":2, "width":3, "height":3, "mass":0.9, "colorCode":"R24", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block727.json b/uml2es/examples/blockFactory/data/blockfactory/block/block727.json deleted file mode 100644 index f9c7e68..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block727.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block727", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"BV0000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block728.json b/uml2es/examples/blockFactory/data/blockfactory/block/block728.json deleted file mode 100644 index 6e14201..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block728.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block728", "length":2, "width":4, "height":3, "mass":4.8, "colorCode":"E21", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block729.json b/uml2es/examples/blockFactory/data/blockfactory/block/block729.json deleted file mode 100644 index 6f79816..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block729.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block729", "length":3, "width":3, "height":5, "mass":9, "colorCode":"RV10", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block73.json b/uml2es/examples/blockFactory/data/blockfactory/block/block73.json deleted file mode 100644 index b464abd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block73.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block73", "length":3, "width":2, "height":4, "mass":1.2, "colorCode":"G19", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block730.json b/uml2es/examples/blockFactory/data/blockfactory/block/block730.json deleted file mode 100644 index 043878d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block730.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block730", "length":3, "width":5, "height":2, "mass":6, "colorCode":"G94", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block731.json b/uml2es/examples/blockFactory/data/blockfactory/block/block731.json deleted file mode 100644 index 58173fe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block731.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block731", "length":3, "width":5, "height":4, "mass":3, "colorCode":"B52", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block732.json b/uml2es/examples/blockFactory/data/blockfactory/block/block732.json deleted file mode 100644 index bfb1094..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block732.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block732", "length":1, "width":3, "height":2, "mass":1.2, "colorCode":"R17", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block733.json b/uml2es/examples/blockFactory/data/blockfactory/block/block733.json deleted file mode 100644 index c7ed418..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block733.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block733", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"E87", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block734.json b/uml2es/examples/blockFactory/data/blockfactory/block/block734.json deleted file mode 100644 index 73713c9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block734.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block734", "length":2, "width":2, "height":4, "mass":0.8, "colorCode":"YG95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block735.json b/uml2es/examples/blockFactory/data/blockfactory/block/block735.json deleted file mode 100644 index 8d0d5a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block735.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block735", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"V01", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block736.json b/uml2es/examples/blockFactory/data/blockfactory/block/block736.json deleted file mode 100644 index 77387b6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block736.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block736", "length":1, "width":4, "height":3, "mass":2.4, "colorCode":"V22", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block737.json b/uml2es/examples/blockFactory/data/blockfactory/block/block737.json deleted file mode 100644 index 5da9ea1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block737.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block737", "length":2, "width":2, "height":5, "mass":4, "colorCode":"G07", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block738.json b/uml2es/examples/blockFactory/data/blockfactory/block/block738.json deleted file mode 100644 index 4a7a8f3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block738.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block738", "length":5, "width":1, "height":4, "mass":4, "colorCode":"E44", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block739.json b/uml2es/examples/blockFactory/data/blockfactory/block/block739.json deleted file mode 100644 index 957eb73..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block739.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block739", "length":1, "width":4, "height":1, "mass":0.8, "colorCode":"E59", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block74.json b/uml2es/examples/blockFactory/data/blockfactory/block/block74.json deleted file mode 100644 index 3f217a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block74.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block74", "length":1, "width":4, "height":4, "mass":0.8, "colorCode":"RV32", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block740.json b/uml2es/examples/blockFactory/data/blockfactory/block/block740.json deleted file mode 100644 index 418a275..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block740.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block740", "length":2, "width":5, "height":1, "mass":2, "colorCode":"YG03", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block741.json b/uml2es/examples/blockFactory/data/blockfactory/block/block741.json deleted file mode 100644 index 1c81b27..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block741.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block741", "length":3, "width":4, "height":4, "mass":9.6, "colorCode":"E49", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block742.json b/uml2es/examples/blockFactory/data/blockfactory/block/block742.json deleted file mode 100644 index 9f9d2fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block742.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block742", "length":5, "width":5, "height":5, "mass":25, "colorCode":"G24", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block743.json b/uml2es/examples/blockFactory/data/blockfactory/block/block743.json deleted file mode 100644 index e21ca66..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block743.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block743", "length":1, "width":3, "height":2, "mass":1.2, "colorCode":"R08", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block744.json b/uml2es/examples/blockFactory/data/blockfactory/block/block744.json deleted file mode 100644 index adb2152..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block744.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block744", "length":2, "width":1, "height":4, "mass":1.6, "colorCode":"RV17", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block745.json b/uml2es/examples/blockFactory/data/blockfactory/block/block745.json deleted file mode 100644 index 9615ac0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block745.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block745", "length":5, "width":2, "height":4, "mass":8, "colorCode":"RV02", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block746.json b/uml2es/examples/blockFactory/data/blockfactory/block/block746.json deleted file mode 100644 index 050b139..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block746.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block746", "length":4, "width":4, "height":5, "mass":16, "colorCode":"Y18", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block747.json b/uml2es/examples/blockFactory/data/blockfactory/block/block747.json deleted file mode 100644 index f86c639..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block747.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block747", "length":3, "width":3, "height":4, "mass":7.2, "colorCode":"BV29", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block748.json b/uml2es/examples/blockFactory/data/blockfactory/block/block748.json deleted file mode 100644 index 57a1cd5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block748.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block748", "length":1, "width":3, "height":2, "mass":1.2, "colorCode":"E87", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block749.json b/uml2es/examples/blockFactory/data/blockfactory/block/block749.json deleted file mode 100644 index 8a227c3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block749.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block749", "length":5, "width":5, "height":2, "mass":10, "colorCode":"W00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block75.json b/uml2es/examples/blockFactory/data/blockfactory/block/block75.json deleted file mode 100644 index a7e67ea..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block75.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block75", "length":4, "width":4, "height":5, "mass":16, "colorCode":"E51", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block750.json b/uml2es/examples/blockFactory/data/blockfactory/block/block750.json deleted file mode 100644 index dc78564..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block750.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block750", "length":1, "width":5, "height":1, "mass":1, "colorCode":"RV09", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block751.json b/uml2es/examples/blockFactory/data/blockfactory/block/block751.json deleted file mode 100644 index f7619ed..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block751.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block751", "length":4, "width":5, "height":2, "mass":8, "colorCode":"R02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block752.json b/uml2es/examples/blockFactory/data/blockfactory/block/block752.json deleted file mode 100644 index 6ceaede..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block752.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block752", "length":4, "width":1, "height":5, "mass":4, "colorCode":"Y32", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block753.json b/uml2es/examples/blockFactory/data/blockfactory/block/block753.json deleted file mode 100644 index 4628e6c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block753.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block753", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"E87", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block754.json b/uml2es/examples/blockFactory/data/blockfactory/block/block754.json deleted file mode 100644 index 950582e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block754.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block754", "length":4, "width":1, "height":4, "mass":3.2, "colorCode":"G09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block755.json b/uml2es/examples/blockFactory/data/blockfactory/block/block755.json deleted file mode 100644 index 5d345b2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block755.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block755", "length":1, "width":2, "height":4, "mass":1.6, "colorCode":"R46", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block756.json b/uml2es/examples/blockFactory/data/blockfactory/block/block756.json deleted file mode 100644 index 86b9421..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block756.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block756", "length":3, "width":1, "height":3, "mass":1.8, "colorCode":"YR24", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block757.json b/uml2es/examples/blockFactory/data/blockfactory/block/block757.json deleted file mode 100644 index cd2a804..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block757.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block757", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"YR04", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block758.json b/uml2es/examples/blockFactory/data/blockfactory/block/block758.json deleted file mode 100644 index a638940..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block758.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block758", "length":3, "width":3, "height":1, "mass":0.45, "colorCode":"Y35", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block759.json b/uml2es/examples/blockFactory/data/blockfactory/block/block759.json deleted file mode 100644 index bfc43be..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block759.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block759", "length":5, "width":1, "height":5, "mass":5, "colorCode":"N1", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block76.json b/uml2es/examples/blockFactory/data/blockfactory/block/block76.json deleted file mode 100644 index 8b62586..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block76.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block76", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"B32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block760.json b/uml2es/examples/blockFactory/data/blockfactory/block/block760.json deleted file mode 100644 index d70265a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block760.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block760", "length":4, "width":5, "height":3, "mass":12, "colorCode":"E51", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block761.json b/uml2es/examples/blockFactory/data/blockfactory/block/block761.json deleted file mode 100644 index b04d890..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block761.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block761", "length":4, "width":1, "height":3, "mass":0.6, "colorCode":"YR61", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block762.json b/uml2es/examples/blockFactory/data/blockfactory/block/block762.json deleted file mode 100644 index 7fedca8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block762.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block762", "length":5, "width":5, "height":4, "mass":5, "colorCode":"R59", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block763.json b/uml2es/examples/blockFactory/data/blockfactory/block/block763.json deleted file mode 100644 index 529e39e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block763.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block763", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"RV95", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block764.json b/uml2es/examples/blockFactory/data/blockfactory/block/block764.json deleted file mode 100644 index 2a88fd7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block764.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block764", "length":2, "width":5, "height":4, "mass":8, "colorCode":"Y13", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block765.json b/uml2es/examples/blockFactory/data/blockfactory/block/block765.json deleted file mode 100644 index 85afa65..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block765.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block765", "length":1, "width":1, "height":1, "mass":0.2, "colorCode":"B66", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block766.json b/uml2es/examples/blockFactory/data/blockfactory/block/block766.json deleted file mode 100644 index ca2fb2f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block766.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block766", "length":2, "width":1, "height":2, "mass":0.8, "colorCode":"G20", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block767.json b/uml2es/examples/blockFactory/data/blockfactory/block/block767.json deleted file mode 100644 index 3b26828..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block767.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block767", "length":4, "width":4, "height":2, "mass":6.4, "colorCode":"C8", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block768.json b/uml2es/examples/blockFactory/data/blockfactory/block/block768.json deleted file mode 100644 index aecf933..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block768.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block768", "length":4, "width":1, "height":3, "mass":0.6, "colorCode":"G12", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block769.json b/uml2es/examples/blockFactory/data/blockfactory/block/block769.json deleted file mode 100644 index 8843f72..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block769.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block769", "length":2, "width":5, "height":3, "mass":6, "colorCode":"YR68", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block77.json b/uml2es/examples/blockFactory/data/blockfactory/block/block77.json deleted file mode 100644 index 32ab3b9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block77.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block77", "length":4, "width":2, "height":1, "mass":0.4, "colorCode":"R27", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block770.json b/uml2es/examples/blockFactory/data/blockfactory/block/block770.json deleted file mode 100644 index 7ece9d6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block770.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block770", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"YG05", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block771.json b/uml2es/examples/blockFactory/data/blockfactory/block/block771.json deleted file mode 100644 index 077c68c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block771.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block771", "length":1, "width":2, "height":1, "mass":0.1, "colorCode":"YG00", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block772.json b/uml2es/examples/blockFactory/data/blockfactory/block/block772.json deleted file mode 100644 index acd7e6b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block772.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block772", "length":5, "width":5, "height":5, "mass":6.25, "colorCode":"B45", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block773.json b/uml2es/examples/blockFactory/data/blockfactory/block/block773.json deleted file mode 100644 index e7e472f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block773.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block773", "length":5, "width":2, "height":4, "mass":8, "colorCode":"B37", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block774.json b/uml2es/examples/blockFactory/data/blockfactory/block/block774.json deleted file mode 100644 index a918075..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block774.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block774", "length":2, "width":5, "height":5, "mass":10, "colorCode":"YR14", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block775.json b/uml2es/examples/blockFactory/data/blockfactory/block/block775.json deleted file mode 100644 index 03ed748..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block775.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block775", "length":3, "width":3, "height":4, "mass":1.8, "colorCode":"G03", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block776.json b/uml2es/examples/blockFactory/data/blockfactory/block/block776.json deleted file mode 100644 index d0bc1a4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block776.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block776", "length":2, "width":4, "height":5, "mass":8, "colorCode":"Y13", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block777.json b/uml2es/examples/blockFactory/data/blockfactory/block/block777.json deleted file mode 100644 index 2a20cfa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block777.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block777", "length":4, "width":4, "height":3, "mass":2.4, "colorCode":"G46", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block778.json b/uml2es/examples/blockFactory/data/blockfactory/block/block778.json deleted file mode 100644 index c4235ab..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block778.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block778", "length":1, "width":1, "height":4, "mass":0.2, "colorCode":"B000", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block779.json b/uml2es/examples/blockFactory/data/blockfactory/block/block779.json deleted file mode 100644 index 824edee..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block779.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block779", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"E34", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block78.json b/uml2es/examples/blockFactory/data/blockfactory/block/block78.json deleted file mode 100644 index caea125..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block78.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block78", "length":3, "width":1, "height":2, "mass":1.2, "colorCode":"YR31", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block780.json b/uml2es/examples/blockFactory/data/blockfactory/block/block780.json deleted file mode 100644 index 6bcb646..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block780.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block780", "length":5, "width":3, "height":4, "mass":12, "colorCode":"R81", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block781.json b/uml2es/examples/blockFactory/data/blockfactory/block/block781.json deleted file mode 100644 index abc8863..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block781.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block781", "length":5, "width":2, "height":1, "mass":0.5, "colorCode":"E95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block782.json b/uml2es/examples/blockFactory/data/blockfactory/block/block782.json deleted file mode 100644 index e65b026..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block782.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block782", "length":1, "width":5, "height":4, "mass":4, "colorCode":"E33", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block783.json b/uml2es/examples/blockFactory/data/blockfactory/block/block783.json deleted file mode 100644 index 62ebcd8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block783.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block783", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"BG49", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block784.json b/uml2es/examples/blockFactory/data/blockfactory/block/block784.json deleted file mode 100644 index e9ed11b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block784.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block784", "length":5, "width":2, "height":3, "mass":6, "colorCode":"G82", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block785.json b/uml2es/examples/blockFactory/data/blockfactory/block/block785.json deleted file mode 100644 index 798c9d3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block785.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block785", "length":2, "width":2, "height":4, "mass":3.2, "colorCode":"YG41", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block786.json b/uml2es/examples/blockFactory/data/blockfactory/block/block786.json deleted file mode 100644 index be41961..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block786.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block786", "length":5, "width":5, "height":1, "mass":5, "colorCode":"YG63", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block787.json b/uml2es/examples/blockFactory/data/blockfactory/block/block787.json deleted file mode 100644 index 64bdb27..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block787.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block787", "length":2, "width":3, "height":2, "mass":0.6, "colorCode":"V09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block788.json b/uml2es/examples/blockFactory/data/blockfactory/block/block788.json deleted file mode 100644 index 92fb4aa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block788.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block788", "length":2, "width":3, "height":2, "mass":2.4, "colorCode":"V04", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block789.json b/uml2es/examples/blockFactory/data/blockfactory/block/block789.json deleted file mode 100644 index b27f5a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block789.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block789", "length":2, "width":1, "height":2, "mass":0.2, "colorCode":"G09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block79.json b/uml2es/examples/blockFactory/data/blockfactory/block/block79.json deleted file mode 100644 index e426195..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block79.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block79", "length":2, "width":3, "height":4, "mass":1.2, "colorCode":"E49", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block790.json b/uml2es/examples/blockFactory/data/blockfactory/block/block790.json deleted file mode 100644 index ed197a8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block790.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block790", "length":1, "width":4, "height":5, "mass":4, "colorCode":"BG32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block791.json b/uml2es/examples/blockFactory/data/blockfactory/block/block791.json deleted file mode 100644 index bc965a5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block791.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block791", "length":1, "width":1, "height":1, "mass":0.2, "colorCode":"E31", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block792.json b/uml2es/examples/blockFactory/data/blockfactory/block/block792.json deleted file mode 100644 index 38658b5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block792.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block792", "length":3, "width":2, "height":3, "mass":3.6, "colorCode":"G24", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block793.json b/uml2es/examples/blockFactory/data/blockfactory/block/block793.json deleted file mode 100644 index d74a5a9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block793.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block793", "length":5, "width":4, "height":4, "mass":16, "colorCode":"BV11", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block794.json b/uml2es/examples/blockFactory/data/blockfactory/block/block794.json deleted file mode 100644 index c19b311..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block794.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block794", "length":5, "width":5, "height":5, "mass":25, "colorCode":"BV25", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block795.json b/uml2es/examples/blockFactory/data/blockfactory/block/block795.json deleted file mode 100644 index f3a6abe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block795.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block795", "length":4, "width":4, "height":4, "mass":3.2, "colorCode":"YG61", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block796.json b/uml2es/examples/blockFactory/data/blockfactory/block/block796.json deleted file mode 100644 index bcb2769..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block796.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block796", "length":1, "width":1, "height":4, "mass":0.2, "colorCode":"N10", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block797.json b/uml2es/examples/blockFactory/data/blockfactory/block/block797.json deleted file mode 100644 index bc688fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block797.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block797", "length":4, "width":1, "height":4, "mass":3.2, "colorCode":"YR01", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block798.json b/uml2es/examples/blockFactory/data/blockfactory/block/block798.json deleted file mode 100644 index 1e313cd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block798.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block798", "length":2, "width":3, "height":5, "mass":6, "colorCode":"BV23", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block799.json b/uml2es/examples/blockFactory/data/blockfactory/block/block799.json deleted file mode 100644 index e8ea27d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block799.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block799", "length":1, "width":2, "height":1, "mass":0.1, "colorCode":"BG96", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block8.json b/uml2es/examples/blockFactory/data/blockfactory/block/block8.json deleted file mode 100644 index e842bad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block8.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block8", "length":5, "width":2, "height":1, "mass":2, "colorCode":"C00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block80.json b/uml2es/examples/blockFactory/data/blockfactory/block/block80.json deleted file mode 100644 index 9564fd0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block80.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block80", "length":2, "width":5, "height":1, "mass":2, "colorCode":"RV95", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block800.json b/uml2es/examples/blockFactory/data/blockfactory/block/block800.json deleted file mode 100644 index 95a7f17..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block800.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block800", "length":4, "width":2, "height":4, "mass":6.4, "colorCode":"E53", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block801.json b/uml2es/examples/blockFactory/data/blockfactory/block/block801.json deleted file mode 100644 index f4e763e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block801.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block801", "length":4, "width":1, "height":3, "mass":2.4, "colorCode":"YR82", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block802.json b/uml2es/examples/blockFactory/data/blockfactory/block/block802.json deleted file mode 100644 index acec16e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block802.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block802", "length":5, "width":4, "height":3, "mass":12, "colorCode":"YG63", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block803.json b/uml2es/examples/blockFactory/data/blockfactory/block/block803.json deleted file mode 100644 index 7551e22..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block803.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block803", "length":5, "width":2, "height":3, "mass":6, "colorCode":"E93", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block804.json b/uml2es/examples/blockFactory/data/blockfactory/block/block804.json deleted file mode 100644 index d5be26d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block804.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block804", "length":5, "width":3, "height":1, "mass":0.75, "colorCode":"W3", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block805.json b/uml2es/examples/blockFactory/data/blockfactory/block/block805.json deleted file mode 100644 index f2ea41f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block805.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block805", "length":3, "width":2, "height":2, "mass":2.4, "colorCode":"BG72", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block806.json b/uml2es/examples/blockFactory/data/blockfactory/block/block806.json deleted file mode 100644 index 2ff55ca..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block806.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block806", "length":3, "width":1, "height":2, "mass":0.3, "colorCode":"R14", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block807.json b/uml2es/examples/blockFactory/data/blockfactory/block/block807.json deleted file mode 100644 index 1d757b2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block807.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block807", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"E53", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block808.json b/uml2es/examples/blockFactory/data/blockfactory/block/block808.json deleted file mode 100644 index 7d90154..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block808.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block808", "length":5, "width":2, "height":5, "mass":10, "colorCode":"YG41", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block809.json b/uml2es/examples/blockFactory/data/blockfactory/block/block809.json deleted file mode 100644 index 8abe12a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block809.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block809", "length":2, "width":2, "height":5, "mass":4, "colorCode":"YG05", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block81.json b/uml2es/examples/blockFactory/data/blockfactory/block/block81.json deleted file mode 100644 index b0fca5b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block81.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block81", "length":1, "width":5, "height":4, "mass":4, "colorCode":"R27", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block810.json b/uml2es/examples/blockFactory/data/blockfactory/block/block810.json deleted file mode 100644 index b7fa40b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block810.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block810", "length":4, "width":3, "height":1, "mass":2.4, "colorCode":"E11", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block811.json b/uml2es/examples/blockFactory/data/blockfactory/block/block811.json deleted file mode 100644 index 650903b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block811.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block811", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"E25", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block812.json b/uml2es/examples/blockFactory/data/blockfactory/block/block812.json deleted file mode 100644 index f2547a7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block812.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block812", "length":1, "width":1, "height":2, "mass":0.4, "colorCode":"100", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block813.json b/uml2es/examples/blockFactory/data/blockfactory/block/block813.json deleted file mode 100644 index bb7611c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block813.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block813", "length":3, "width":4, "height":2, "mass":4.8, "colorCode":"E31", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block814.json b/uml2es/examples/blockFactory/data/blockfactory/block/block814.json deleted file mode 100644 index f8601a5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block814.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block814", "length":5, "width":4, "height":2, "mass":2, "colorCode":"Y21", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block815.json b/uml2es/examples/blockFactory/data/blockfactory/block/block815.json deleted file mode 100644 index 964fe18..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block815.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block815", "length":1, "width":2, "height":1, "mass":0.4, "colorCode":"Y000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block816.json b/uml2es/examples/blockFactory/data/blockfactory/block/block816.json deleted file mode 100644 index 8cafdbf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block816.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block816", "length":3, "width":5, "height":3, "mass":2.25, "colorCode":"W2", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block817.json b/uml2es/examples/blockFactory/data/blockfactory/block/block817.json deleted file mode 100644 index 1714ee3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block817.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block817", "length":5, "width":5, "height":3, "mass":3.75, "colorCode":"YR01", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block818.json b/uml2es/examples/blockFactory/data/blockfactory/block/block818.json deleted file mode 100644 index 0f79593..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block818.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block818", "length":5, "width":2, "height":2, "mass":4, "colorCode":"0", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block819.json b/uml2es/examples/blockFactory/data/blockfactory/block/block819.json deleted file mode 100644 index 1f6d5fe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block819.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block819", "length":5, "width":5, "height":3, "mass":15, "colorCode":"RV000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block82.json b/uml2es/examples/blockFactory/data/blockfactory/block/block82.json deleted file mode 100644 index 1502f3a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block82.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block82", "length":1, "width":1, "height":1, "mass":0.05, "colorCode":"T8", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block820.json b/uml2es/examples/blockFactory/data/blockfactory/block/block820.json deleted file mode 100644 index f61f838..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block820.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block820", "length":5, "width":1, "height":3, "mass":3, "colorCode":"FY1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block821.json b/uml2es/examples/blockFactory/data/blockfactory/block/block821.json deleted file mode 100644 index 5e0928b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block821.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block821", "length":4, "width":3, "height":4, "mass":9.6, "colorCode":"C7", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block822.json b/uml2es/examples/blockFactory/data/blockfactory/block/block822.json deleted file mode 100644 index 890ad9b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block822.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block822", "length":3, "width":4, "height":2, "mass":1.2, "colorCode":"FYG1", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block823.json b/uml2es/examples/blockFactory/data/blockfactory/block/block823.json deleted file mode 100644 index a19821c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block823.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block823", "length":3, "width":3, "height":5, "mass":9, "colorCode":"YG07", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block824.json b/uml2es/examples/blockFactory/data/blockfactory/block/block824.json deleted file mode 100644 index 77dac7f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block824.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block824", "length":1, "width":5, "height":2, "mass":0.5, "colorCode":"R30", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block825.json b/uml2es/examples/blockFactory/data/blockfactory/block/block825.json deleted file mode 100644 index 617aa5b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block825.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block825", "length":3, "width":4, "height":4, "mass":2.4, "colorCode":"W3", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block826.json b/uml2es/examples/blockFactory/data/blockfactory/block/block826.json deleted file mode 100644 index 865065f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block826.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block826", "length":4, "width":4, "height":1, "mass":0.8, "colorCode":"E74", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block827.json b/uml2es/examples/blockFactory/data/blockfactory/block/block827.json deleted file mode 100644 index 3661637..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block827.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block827", "length":4, "width":1, "height":3, "mass":0.6, "colorCode":"FYG1", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block828.json b/uml2es/examples/blockFactory/data/blockfactory/block/block828.json deleted file mode 100644 index 63d8fcf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block828.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block828", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"YG05", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block829.json b/uml2es/examples/blockFactory/data/blockfactory/block/block829.json deleted file mode 100644 index dc168b2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block829.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block829", "length":1, "width":5, "height":4, "mass":4, "colorCode":"YR27", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block83.json b/uml2es/examples/blockFactory/data/blockfactory/block/block83.json deleted file mode 100644 index e68666f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block83.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block83", "length":1, "width":4, "height":3, "mass":2.4, "colorCode":"G24", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block830.json b/uml2es/examples/blockFactory/data/blockfactory/block/block830.json deleted file mode 100644 index a7857da..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block830.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block830", "length":5, "width":1, "height":3, "mass":3, "colorCode":"Y35", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block831.json b/uml2es/examples/blockFactory/data/blockfactory/block/block831.json deleted file mode 100644 index b6eff54..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block831.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block831", "length":1, "width":5, "height":2, "mass":2, "colorCode":"E40", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block832.json b/uml2es/examples/blockFactory/data/blockfactory/block/block832.json deleted file mode 100644 index 3456b23..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block832.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block832", "length":4, "width":1, "height":4, "mass":3.2, "colorCode":"E19", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block833.json b/uml2es/examples/blockFactory/data/blockfactory/block/block833.json deleted file mode 100644 index bc26722..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block833.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block833", "length":4, "width":5, "height":5, "mass":20, "colorCode":"YR02", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block834.json b/uml2es/examples/blockFactory/data/blockfactory/block/block834.json deleted file mode 100644 index 357dbe1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block834.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block834", "length":4, "width":2, "height":4, "mass":6.4, "colorCode":"100", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block835.json b/uml2es/examples/blockFactory/data/blockfactory/block/block835.json deleted file mode 100644 index aa8cccf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block835.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block835", "length":2, "width":2, "height":2, "mass":0.4, "colorCode":"RV02", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block836.json b/uml2es/examples/blockFactory/data/blockfactory/block/block836.json deleted file mode 100644 index e7c89d3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block836.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block836", "length":5, "width":4, "height":4, "mass":16, "colorCode":"YR18", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block837.json b/uml2es/examples/blockFactory/data/blockfactory/block/block837.json deleted file mode 100644 index da724bf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block837.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block837", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"BG09", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block838.json b/uml2es/examples/blockFactory/data/blockfactory/block/block838.json deleted file mode 100644 index da33872..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block838.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block838", "length":5, "width":3, "height":4, "mass":3, "colorCode":"BG09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block839.json b/uml2es/examples/blockFactory/data/blockfactory/block/block839.json deleted file mode 100644 index 87de669..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block839.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block839", "length":2, "width":1, "height":3, "mass":1.2, "colorCode":"B37", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block84.json b/uml2es/examples/blockFactory/data/blockfactory/block/block84.json deleted file mode 100644 index ca4e37b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block84.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block84", "length":4, "width":4, "height":5, "mass":16, "colorCode":"W7", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block840.json b/uml2es/examples/blockFactory/data/blockfactory/block/block840.json deleted file mode 100644 index 52f9c20..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block840.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block840", "length":1, "width":4, "height":4, "mass":0.8, "colorCode":"RV09", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block841.json b/uml2es/examples/blockFactory/data/blockfactory/block/block841.json deleted file mode 100644 index e95682d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block841.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block841", "length":3, "width":3, "height":3, "mass":5.4, "colorCode":"W4", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block842.json b/uml2es/examples/blockFactory/data/blockfactory/block/block842.json deleted file mode 100644 index e12e5e2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block842.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block842", "length":5, "width":5, "height":2, "mass":10, "colorCode":"T6", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block843.json b/uml2es/examples/blockFactory/data/blockfactory/block/block843.json deleted file mode 100644 index 03ccfc2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block843.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block843", "length":5, "width":5, "height":5, "mass":6.25, "colorCode":"E18", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block844.json b/uml2es/examples/blockFactory/data/blockfactory/block/block844.json deleted file mode 100644 index 66eeb71..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block844.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block844", "length":5, "width":3, "height":4, "mass":12, "colorCode":"E81", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block845.json b/uml2es/examples/blockFactory/data/blockfactory/block/block845.json deleted file mode 100644 index f55d304..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block845.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block845", "length":4, "width":4, "height":3, "mass":9.6, "colorCode":"G24", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block846.json b/uml2es/examples/blockFactory/data/blockfactory/block/block846.json deleted file mode 100644 index a1d39fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block846.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block846", "length":2, "width":4, "height":5, "mass":8, "colorCode":"G20", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block847.json b/uml2es/examples/blockFactory/data/blockfactory/block/block847.json deleted file mode 100644 index eb3a58d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block847.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block847", "length":3, "width":2, "height":2, "mass":0.6, "colorCode":"B79", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block848.json b/uml2es/examples/blockFactory/data/blockfactory/block/block848.json deleted file mode 100644 index 9d849a7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block848.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block848", "length":1, "width":1, "height":5, "mass":1, "colorCode":"C0", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block849.json b/uml2es/examples/blockFactory/data/blockfactory/block/block849.json deleted file mode 100644 index 397f66d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block849.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block849", "length":3, "width":2, "height":1, "mass":0.3, "colorCode":"YR27", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block85.json b/uml2es/examples/blockFactory/data/blockfactory/block/block85.json deleted file mode 100644 index 6c9da28..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block85.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block85", "length":5, "width":4, "height":4, "mass":16, "colorCode":"N7", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block850.json b/uml2es/examples/blockFactory/data/blockfactory/block/block850.json deleted file mode 100644 index d2cb96f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block850.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block850", "length":1, "width":1, "height":2, "mass":0.4, "colorCode":"Y13", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block851.json b/uml2es/examples/blockFactory/data/blockfactory/block/block851.json deleted file mode 100644 index 4bfae23..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block851.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block851", "length":2, "width":3, "height":2, "mass":2.4, "colorCode":"N8", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block852.json b/uml2es/examples/blockFactory/data/blockfactory/block/block852.json deleted file mode 100644 index 431654d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block852.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block852", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"BV34", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block853.json b/uml2es/examples/blockFactory/data/blockfactory/block/block853.json deleted file mode 100644 index 1081cc2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block853.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block853", "length":4, "width":1, "height":4, "mass":3.2, "colorCode":"BG02", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block854.json b/uml2es/examples/blockFactory/data/blockfactory/block/block854.json deleted file mode 100644 index 01e405b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block854.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block854", "length":3, "width":2, "height":2, "mass":2.4, "colorCode":"YG01", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block855.json b/uml2es/examples/blockFactory/data/blockfactory/block/block855.json deleted file mode 100644 index 9c7ba6a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block855.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block855", "length":2, "width":4, "height":3, "mass":4.8, "colorCode":"E29", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block856.json b/uml2es/examples/blockFactory/data/blockfactory/block/block856.json deleted file mode 100644 index 918a0b5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block856.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block856", "length":3, "width":5, "height":2, "mass":6, "colorCode":"BG78", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block857.json b/uml2es/examples/blockFactory/data/blockfactory/block/block857.json deleted file mode 100644 index 3c366ec..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block857.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block857", "length":3, "width":4, "height":3, "mass":7.2, "colorCode":"E50", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block858.json b/uml2es/examples/blockFactory/data/blockfactory/block/block858.json deleted file mode 100644 index 1a4a045..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block858.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block858", "length":4, "width":5, "height":2, "mass":8, "colorCode":"RV02", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block859.json b/uml2es/examples/blockFactory/data/blockfactory/block/block859.json deleted file mode 100644 index 394df18..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block859.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block859", "length":5, "width":2, "height":1, "mass":2, "colorCode":"E00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block86.json b/uml2es/examples/blockFactory/data/blockfactory/block/block86.json deleted file mode 100644 index 46b1f8e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block86.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block86", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"T3", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block860.json b/uml2es/examples/blockFactory/data/blockfactory/block/block860.json deleted file mode 100644 index 53180e2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block860.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block860", "length":1, "width":5, "height":2, "mass":2, "colorCode":"RV99", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block861.json b/uml2es/examples/blockFactory/data/blockfactory/block/block861.json deleted file mode 100644 index e134705..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block861.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block861", "length":3, "width":3, "height":2, "mass":3.6, "colorCode":"B60", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block862.json b/uml2es/examples/blockFactory/data/blockfactory/block/block862.json deleted file mode 100644 index 831a23f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block862.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block862", "length":5, "width":3, "height":3, "mass":9, "colorCode":"C8", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block863.json b/uml2es/examples/blockFactory/data/blockfactory/block/block863.json deleted file mode 100644 index 25dd162..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block863.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block863", "length":3, "width":3, "height":5, "mass":9, "colorCode":"C6", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block864.json b/uml2es/examples/blockFactory/data/blockfactory/block/block864.json deleted file mode 100644 index 339f0cd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block864.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block864", "length":1, "width":5, "height":3, "mass":0.75, "colorCode":"V20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block865.json b/uml2es/examples/blockFactory/data/blockfactory/block/block865.json deleted file mode 100644 index 5de7b6d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block865.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block865", "length":1, "width":1, "height":4, "mass":0.8, "colorCode":"Y23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block866.json b/uml2es/examples/blockFactory/data/blockfactory/block/block866.json deleted file mode 100644 index c5cb1ae..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block866.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block866", "length":5, "width":4, "height":3, "mass":12, "colorCode":"RV17", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block867.json b/uml2es/examples/blockFactory/data/blockfactory/block/block867.json deleted file mode 100644 index ca126cf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block867.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block867", "length":3, "width":2, "height":4, "mass":4.8, "colorCode":"E08", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block868.json b/uml2es/examples/blockFactory/data/blockfactory/block/block868.json deleted file mode 100644 index 4dd83ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block868.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block868", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"W6", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block869.json b/uml2es/examples/blockFactory/data/blockfactory/block/block869.json deleted file mode 100644 index a294ed5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block869.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block869", "length":2, "width":2, "height":4, "mass":3.2, "colorCode":"G02", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block87.json b/uml2es/examples/blockFactory/data/blockfactory/block/block87.json deleted file mode 100644 index 241e42b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block87.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block87", "length":1, "width":5, "height":3, "mass":3, "colorCode":"T8", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block870.json b/uml2es/examples/blockFactory/data/blockfactory/block/block870.json deleted file mode 100644 index e6e0f33..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block870.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block870", "length":3, "width":1, "height":3, "mass":1.8, "colorCode":"YG63", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block871.json b/uml2es/examples/blockFactory/data/blockfactory/block/block871.json deleted file mode 100644 index 3a0dc2e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block871.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block871", "length":5, "width":1, "height":4, "mass":4, "colorCode":"RV91", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block872.json b/uml2es/examples/blockFactory/data/blockfactory/block/block872.json deleted file mode 100644 index a963645..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block872.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block872", "length":5, "width":2, "height":4, "mass":8, "colorCode":"B21", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block873.json b/uml2es/examples/blockFactory/data/blockfactory/block/block873.json deleted file mode 100644 index 4c379e9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block873.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block873", "length":5, "width":5, "height":4, "mass":20, "colorCode":"E31", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block874.json b/uml2es/examples/blockFactory/data/blockfactory/block/block874.json deleted file mode 100644 index ca656ff..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block874.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block874", "length":4, "width":2, "height":1, "mass":1.6, "colorCode":"V20", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block875.json b/uml2es/examples/blockFactory/data/blockfactory/block/block875.json deleted file mode 100644 index 6f80624..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block875.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block875", "length":1, "width":5, "height":5, "mass":5, "colorCode":"V95", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block876.json b/uml2es/examples/blockFactory/data/blockfactory/block/block876.json deleted file mode 100644 index dad2694..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block876.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block876", "length":1, "width":4, "height":2, "mass":0.4, "colorCode":"E87", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block877.json b/uml2es/examples/blockFactory/data/blockfactory/block/block877.json deleted file mode 100644 index 251cd09..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block877.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block877", "length":5, "width":4, "height":1, "mass":4, "colorCode":"BG72", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block878.json b/uml2es/examples/blockFactory/data/blockfactory/block/block878.json deleted file mode 100644 index c8a0248..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block878.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block878", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"YR000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block879.json b/uml2es/examples/blockFactory/data/blockfactory/block/block879.json deleted file mode 100644 index 8df72ec..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block879.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block879", "length":4, "width":4, "height":3, "mass":9.6, "colorCode":"BV31", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block88.json b/uml2es/examples/blockFactory/data/blockfactory/block/block88.json deleted file mode 100644 index 6e1abfe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block88.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block88", "length":3, "width":1, "height":3, "mass":1.8, "colorCode":"FYG2", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block880.json b/uml2es/examples/blockFactory/data/blockfactory/block/block880.json deleted file mode 100644 index aa80b67..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block880.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block880", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"Y06", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block881.json b/uml2es/examples/blockFactory/data/blockfactory/block/block881.json deleted file mode 100644 index e6bdff9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block881.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block881", "length":4, "width":5, "height":5, "mass":20, "colorCode":"E97", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block882.json b/uml2es/examples/blockFactory/data/blockfactory/block/block882.json deleted file mode 100644 index c10a955..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block882.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block882", "length":1, "width":1, "height":3, "mass":0.6, "colorCode":"N5", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block883.json b/uml2es/examples/blockFactory/data/blockfactory/block/block883.json deleted file mode 100644 index 1bf01ca..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block883.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block883", "length":1, "width":5, "height":2, "mass":2, "colorCode":"W4", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block884.json b/uml2es/examples/blockFactory/data/blockfactory/block/block884.json deleted file mode 100644 index 4e97b47..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block884.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block884", "length":5, "width":2, "height":3, "mass":6, "colorCode":"YR82", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block885.json b/uml2es/examples/blockFactory/data/blockfactory/block/block885.json deleted file mode 100644 index 2e1998c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block885.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block885", "length":5, "width":3, "height":5, "mass":15, "colorCode":"RV17", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block886.json b/uml2es/examples/blockFactory/data/blockfactory/block/block886.json deleted file mode 100644 index f89e852..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block886.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block886", "length":4, "width":3, "height":5, "mass":3, "colorCode":"E97", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block887.json b/uml2es/examples/blockFactory/data/blockfactory/block/block887.json deleted file mode 100644 index c0ce37c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block887.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block887", "length":3, "width":5, "height":4, "mass":3, "colorCode":"YR02", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block888.json b/uml2es/examples/blockFactory/data/blockfactory/block/block888.json deleted file mode 100644 index 8b7da30..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block888.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block888", "length":2, "width":1, "height":3, "mass":1.2, "colorCode":"Y15", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block889.json b/uml2es/examples/blockFactory/data/blockfactory/block/block889.json deleted file mode 100644 index 7d7aeb7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block889.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block889", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"YG03", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block89.json b/uml2es/examples/blockFactory/data/blockfactory/block/block89.json deleted file mode 100644 index cf045ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block89.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block89", "length":1, "width":4, "height":5, "mass":1, "colorCode":"Y19", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block890.json b/uml2es/examples/blockFactory/data/blockfactory/block/block890.json deleted file mode 100644 index a55a209..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block890.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block890", "length":1, "width":5, "height":4, "mass":4, "colorCode":"YR21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block891.json b/uml2es/examples/blockFactory/data/blockfactory/block/block891.json deleted file mode 100644 index 620e719..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block891.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block891", "length":1, "width":3, "height":2, "mass":0.3, "colorCode":"E21", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block892.json b/uml2es/examples/blockFactory/data/blockfactory/block/block892.json deleted file mode 100644 index 7b25d85..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block892.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block892", "length":1, "width":4, "height":2, "mass":0.4, "colorCode":"T3", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block893.json b/uml2es/examples/blockFactory/data/blockfactory/block/block893.json deleted file mode 100644 index f2b4b11..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block893.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block893", "length":5, "width":2, "height":1, "mass":2, "colorCode":"G17", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block894.json b/uml2es/examples/blockFactory/data/blockfactory/block/block894.json deleted file mode 100644 index a9f2f1f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block894.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block894", "length":2, "width":5, "height":5, "mass":2.5, "colorCode":"BG72", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block895.json b/uml2es/examples/blockFactory/data/blockfactory/block/block895.json deleted file mode 100644 index 52deedf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block895.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block895", "length":5, "width":1, "height":1, "mass":1, "colorCode":"YG11", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block896.json b/uml2es/examples/blockFactory/data/blockfactory/block/block896.json deleted file mode 100644 index 29f7951..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block896.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block896", "length":5, "width":5, "height":1, "mass":1.25, "colorCode":"R11", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block897.json b/uml2es/examples/blockFactory/data/blockfactory/block/block897.json deleted file mode 100644 index ffaeb5a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block897.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block897", "length":5, "width":5, "height":4, "mass":5, "colorCode":"BG23", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block898.json b/uml2es/examples/blockFactory/data/blockfactory/block/block898.json deleted file mode 100644 index 16799e6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block898.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block898", "length":4, "width":4, "height":5, "mass":16, "colorCode":"BV34", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block899.json b/uml2es/examples/blockFactory/data/blockfactory/block/block899.json deleted file mode 100644 index 9349333..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block899.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block899", "length":2, "width":3, "height":2, "mass":0.6, "colorCode":"B95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block9.json b/uml2es/examples/blockFactory/data/blockfactory/block/block9.json deleted file mode 100644 index cd38cf2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block9.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block9", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"FB2", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block90.json b/uml2es/examples/blockFactory/data/blockfactory/block/block90.json deleted file mode 100644 index 31652fe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block90.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block90", "length":3, "width":2, "height":2, "mass":2.4, "colorCode":"V99", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block900.json b/uml2es/examples/blockFactory/data/blockfactory/block/block900.json deleted file mode 100644 index 117c253..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block900.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block900", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"R24", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block901.json b/uml2es/examples/blockFactory/data/blockfactory/block/block901.json deleted file mode 100644 index c9f4160..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block901.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block901", "length":2, "width":4, "height":3, "mass":4.8, "colorCode":"BG32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block902.json b/uml2es/examples/blockFactory/data/blockfactory/block/block902.json deleted file mode 100644 index e91008b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block902.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block902", "length":1, "width":2, "height":5, "mass":2, "colorCode":"E01", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block903.json b/uml2es/examples/blockFactory/data/blockfactory/block/block903.json deleted file mode 100644 index 32a6353..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block903.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block903", "length":5, "width":3, "height":3, "mass":9, "colorCode":"YR000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block904.json b/uml2es/examples/blockFactory/data/blockfactory/block/block904.json deleted file mode 100644 index 1a8a15e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block904.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block904", "length":2, "width":4, "height":5, "mass":2, "colorCode":"B69", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block905.json b/uml2es/examples/blockFactory/data/blockfactory/block/block905.json deleted file mode 100644 index c9e9714..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block905.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block905", "length":2, "width":3, "height":3, "mass":0.9, "colorCode":"B63", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block906.json b/uml2es/examples/blockFactory/data/blockfactory/block/block906.json deleted file mode 100644 index 1f704a3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block906.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block906", "length":3, "width":4, "height":1, "mass":2.4, "colorCode":"N1", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block907.json b/uml2es/examples/blockFactory/data/blockfactory/block/block907.json deleted file mode 100644 index 91a23a7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block907.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block907", "length":1, "width":5, "height":2, "mass":0.5, "colorCode":"T5", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block908.json b/uml2es/examples/blockFactory/data/blockfactory/block/block908.json deleted file mode 100644 index 96dad87..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block908.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block908", "length":1, "width":2, "height":3, "mass":1.2, "colorCode":"B52", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block909.json b/uml2es/examples/blockFactory/data/blockfactory/block/block909.json deleted file mode 100644 index edb2050..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block909.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block909", "length":1, "width":5, "height":1, "mass":1, "colorCode":"V04", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block91.json b/uml2es/examples/blockFactory/data/blockfactory/block/block91.json deleted file mode 100644 index 4bedace..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block91.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block91", "length":1, "width":5, "height":5, "mass":5, "colorCode":"R000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block910.json b/uml2es/examples/blockFactory/data/blockfactory/block/block910.json deleted file mode 100644 index 711a447..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block910.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block910", "length":2, "width":3, "height":5, "mass":6, "colorCode":"B14", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block911.json b/uml2es/examples/blockFactory/data/blockfactory/block/block911.json deleted file mode 100644 index 18be4de..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block911.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block911", "length":4, "width":2, "height":4, "mass":6.4, "colorCode":"E35", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block912.json b/uml2es/examples/blockFactory/data/blockfactory/block/block912.json deleted file mode 100644 index 7f7fd49..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block912.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block912", "length":1, "width":2, "height":4, "mass":1.6, "colorCode":"BG02", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block913.json b/uml2es/examples/blockFactory/data/blockfactory/block/block913.json deleted file mode 100644 index 8f42a0a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block913.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block913", "length":5, "width":2, "height":3, "mass":6, "colorCode":"V0000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block914.json b/uml2es/examples/blockFactory/data/blockfactory/block/block914.json deleted file mode 100644 index a7e9e83..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block914.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block914", "length":1, "width":5, "height":3, "mass":3, "colorCode":"YR000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block915.json b/uml2es/examples/blockFactory/data/blockfactory/block/block915.json deleted file mode 100644 index 3b2b2f2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block915.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block915", "length":4, "width":1, "height":1, "mass":0.8, "colorCode":"E47", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block916.json b/uml2es/examples/blockFactory/data/blockfactory/block/block916.json deleted file mode 100644 index b2f9b95..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block916.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block916", "length":2, "width":5, "height":2, "mass":4, "colorCode":"RV29", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block917.json b/uml2es/examples/blockFactory/data/blockfactory/block/block917.json deleted file mode 100644 index d3fcdaf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block917.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block917", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"Y13", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block918.json b/uml2es/examples/blockFactory/data/blockfactory/block/block918.json deleted file mode 100644 index 06d3857..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block918.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block918", "length":2, "width":1, "height":1, "mass":0.4, "colorCode":"R59", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block919.json b/uml2es/examples/blockFactory/data/blockfactory/block/block919.json deleted file mode 100644 index 9fb51f3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block919.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block919", "length":1, "width":4, "height":3, "mass":0.6, "colorCode":"BG72", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block92.json b/uml2es/examples/blockFactory/data/blockfactory/block/block92.json deleted file mode 100644 index 9c88162..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block92.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block92", "length":5, "width":3, "height":3, "mass":2.25, "colorCode":"YR04", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block920.json b/uml2es/examples/blockFactory/data/blockfactory/block/block920.json deleted file mode 100644 index 7f1cadf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block920.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block920", "length":2, "width":2, "height":3, "mass":2.4, "colorCode":"V28", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block921.json b/uml2es/examples/blockFactory/data/blockfactory/block/block921.json deleted file mode 100644 index 7736b80..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block921.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block921", "length":1, "width":3, "height":1, "mass":0.15, "colorCode":"Y06", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block922.json b/uml2es/examples/blockFactory/data/blockfactory/block/block922.json deleted file mode 100644 index 01cd15f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block922.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block922", "length":1, "width":3, "height":1, "mass":0.15, "colorCode":"B21", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block923.json b/uml2es/examples/blockFactory/data/blockfactory/block/block923.json deleted file mode 100644 index 87ccb63..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block923.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block923", "length":2, "width":1, "height":4, "mass":1.6, "colorCode":"BG10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block924.json b/uml2es/examples/blockFactory/data/blockfactory/block/block924.json deleted file mode 100644 index 9d213bf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block924.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block924", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"G14", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block925.json b/uml2es/examples/blockFactory/data/blockfactory/block/block925.json deleted file mode 100644 index 82af73c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block925.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block925", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"T5", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block926.json b/uml2es/examples/blockFactory/data/blockfactory/block/block926.json deleted file mode 100644 index c113b8a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block926.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block926", "length":5, "width":2, "height":4, "mass":8, "colorCode":"G000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block927.json b/uml2es/examples/blockFactory/data/blockfactory/block/block927.json deleted file mode 100644 index ca4dfee..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block927.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block927", "length":1, "width":1, "height":1, "mass":0.2, "colorCode":"E93", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block928.json b/uml2es/examples/blockFactory/data/blockfactory/block/block928.json deleted file mode 100644 index aca9e49..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block928.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block928", "length":3, "width":5, "height":3, "mass":9, "colorCode":"Y28", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block929.json b/uml2es/examples/blockFactory/data/blockfactory/block/block929.json deleted file mode 100644 index 78a4476..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block929.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block929", "length":5, "width":1, "height":1, "mass":1, "colorCode":"R35", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block93.json b/uml2es/examples/blockFactory/data/blockfactory/block/block93.json deleted file mode 100644 index 5c32c60..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block93.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block93", "length":3, "width":5, "height":5, "mass":15, "colorCode":"G000", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block930.json b/uml2es/examples/blockFactory/data/blockfactory/block/block930.json deleted file mode 100644 index ad58b90..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block930.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block930", "length":5, "width":3, "height":3, "mass":2.25, "colorCode":"YR20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block931.json b/uml2es/examples/blockFactory/data/blockfactory/block/block931.json deleted file mode 100644 index 26a09ae..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block931.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block931", "length":4, "width":5, "height":2, "mass":8, "colorCode":"RV95", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block932.json b/uml2es/examples/blockFactory/data/blockfactory/block/block932.json deleted file mode 100644 index c07deaf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block932.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block932", "length":4, "width":1, "height":5, "mass":1, "colorCode":"B63", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block933.json b/uml2es/examples/blockFactory/data/blockfactory/block/block933.json deleted file mode 100644 index 270bdfe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block933.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block933", "length":4, "width":5, "height":3, "mass":12, "colorCode":"G46", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block934.json b/uml2es/examples/blockFactory/data/blockfactory/block/block934.json deleted file mode 100644 index 371aae6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block934.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block934", "length":4, "width":2, "height":2, "mass":3.2, "colorCode":"RV42", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block935.json b/uml2es/examples/blockFactory/data/blockfactory/block/block935.json deleted file mode 100644 index c25f9a5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block935.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block935", "length":2, "width":5, "height":5, "mass":10, "colorCode":"C4", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block936.json b/uml2es/examples/blockFactory/data/blockfactory/block/block936.json deleted file mode 100644 index d099929..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block936.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block936", "length":1, "width":1, "height":3, "mass":0.6, "colorCode":"YG13", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block937.json b/uml2es/examples/blockFactory/data/blockfactory/block/block937.json deleted file mode 100644 index c2ae708..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block937.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block937", "length":3, "width":2, "height":1, "mass":0.3, "colorCode":"BV31", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block938.json b/uml2es/examples/blockFactory/data/blockfactory/block/block938.json deleted file mode 100644 index 6b37f77..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block938.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block938", "length":4, "width":3, "height":3, "mass":7.2, "colorCode":"FV2", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block939.json b/uml2es/examples/blockFactory/data/blockfactory/block/block939.json deleted file mode 100644 index 8b038d0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block939.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block939", "length":5, "width":2, "height":3, "mass":1.5, "colorCode":"B16", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block94.json b/uml2es/examples/blockFactory/data/blockfactory/block/block94.json deleted file mode 100644 index 281f2b7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block94.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block94", "length":2, "width":1, "height":2, "mass":0.8, "colorCode":"T5", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block940.json b/uml2es/examples/blockFactory/data/blockfactory/block/block940.json deleted file mode 100644 index 0bef333..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block940.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block940", "length":1, "width":2, "height":2, "mass":0.8, "colorCode":"YR07", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block941.json b/uml2es/examples/blockFactory/data/blockfactory/block/block941.json deleted file mode 100644 index 8014ad7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block941.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block941", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"FRV1", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block942.json b/uml2es/examples/blockFactory/data/blockfactory/block/block942.json deleted file mode 100644 index c3bcb68..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block942.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block942", "length":4, "width":4, "height":1, "mass":0.8, "colorCode":"N3", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block943.json b/uml2es/examples/blockFactory/data/blockfactory/block/block943.json deleted file mode 100644 index 3dc815a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block943.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block943", "length":2, "width":5, "height":1, "mass":0.5, "colorCode":"V22", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block944.json b/uml2es/examples/blockFactory/data/blockfactory/block/block944.json deleted file mode 100644 index 6be5909..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block944.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block944", "length":4, "width":4, "height":4, "mass":12.8, "colorCode":"E42", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block945.json b/uml2es/examples/blockFactory/data/blockfactory/block/block945.json deleted file mode 100644 index f2fe624..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block945.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block945", "length":5, "width":2, "height":3, "mass":6, "colorCode":"YG93", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block946.json b/uml2es/examples/blockFactory/data/blockfactory/block/block946.json deleted file mode 100644 index 397fa44..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block946.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block946", "length":3, "width":1, "height":3, "mass":0.45, "colorCode":"E27", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block947.json b/uml2es/examples/blockFactory/data/blockfactory/block/block947.json deleted file mode 100644 index 1b0b8fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block947.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block947", "length":5, "width":5, "height":2, "mass":2.5, "colorCode":"BG11", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block948.json b/uml2es/examples/blockFactory/data/blockfactory/block/block948.json deleted file mode 100644 index 25b72b0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block948.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block948", "length":5, "width":3, "height":2, "mass":6, "colorCode":"RV23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block949.json b/uml2es/examples/blockFactory/data/blockfactory/block/block949.json deleted file mode 100644 index 14cc0ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block949.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block949", "length":2, "width":5, "height":4, "mass":8, "colorCode":"G21", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block95.json b/uml2es/examples/blockFactory/data/blockfactory/block/block95.json deleted file mode 100644 index 8abd599..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block95.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block95", "length":1, "width":2, "height":1, "mass":0.1, "colorCode":"R14", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block950.json b/uml2es/examples/blockFactory/data/blockfactory/block/block950.json deleted file mode 100644 index 5a270e5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block950.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block950", "length":4, "width":2, "height":5, "mass":8, "colorCode":"YG07", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block951.json b/uml2es/examples/blockFactory/data/blockfactory/block/block951.json deleted file mode 100644 index 2422bc1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block951.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block951", "length":3, "width":5, "height":2, "mass":6, "colorCode":"E41", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block952.json b/uml2es/examples/blockFactory/data/blockfactory/block/block952.json deleted file mode 100644 index 820bd40..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block952.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block952", "length":4, "width":4, "height":3, "mass":2.4, "colorCode":"BG10", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block953.json b/uml2es/examples/blockFactory/data/blockfactory/block/block953.json deleted file mode 100644 index d22ca99..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block953.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block953", "length":3, "width":2, "height":1, "mass":0.3, "colorCode":"T9", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block954.json b/uml2es/examples/blockFactory/data/blockfactory/block/block954.json deleted file mode 100644 index 0f34127..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block954.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block954", "length":2, "width":4, "height":2, "mass":3.2, "colorCode":"Y13", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block955.json b/uml2es/examples/blockFactory/data/blockfactory/block/block955.json deleted file mode 100644 index 5e42f17..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block955.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block955", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"BG75", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block956.json b/uml2es/examples/blockFactory/data/blockfactory/block/block956.json deleted file mode 100644 index 752edb7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block956.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block956", "length":1, "width":3, "height":4, "mass":0.6, "colorCode":"V28", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block957.json b/uml2es/examples/blockFactory/data/blockfactory/block/block957.json deleted file mode 100644 index d3ff1c4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block957.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block957", "length":5, "width":5, "height":1, "mass":5, "colorCode":"E37", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block958.json b/uml2es/examples/blockFactory/data/blockfactory/block/block958.json deleted file mode 100644 index 83c1c06..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block958.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block958", "length":4, "width":4, "height":4, "mass":12.8, "colorCode":"N9", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block959.json b/uml2es/examples/blockFactory/data/blockfactory/block/block959.json deleted file mode 100644 index e528620..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block959.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block959", "length":3, "width":4, "height":5, "mass":3, "colorCode":"W5", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block96.json b/uml2es/examples/blockFactory/data/blockfactory/block/block96.json deleted file mode 100644 index 83ac5d1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block96.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block96", "length":4, "width":3, "height":1, "mass":2.4, "colorCode":"B00", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block960.json b/uml2es/examples/blockFactory/data/blockfactory/block/block960.json deleted file mode 100644 index edbfb9e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block960.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block960", "length":4, "width":2, "height":5, "mass":2, "colorCode":"YG41", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block961.json b/uml2es/examples/blockFactory/data/blockfactory/block/block961.json deleted file mode 100644 index 9b9db90..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block961.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block961", "length":4, "width":1, "height":2, "mass":1.6, "colorCode":"RV00", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block962.json b/uml2es/examples/blockFactory/data/blockfactory/block/block962.json deleted file mode 100644 index ee1bc68..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block962.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block962", "length":5, "width":3, "height":2, "mass":6, "colorCode":"T8", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block963.json b/uml2es/examples/blockFactory/data/blockfactory/block/block963.json deleted file mode 100644 index 0acd506..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block963.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block963", "length":4, "width":4, "height":3, "mass":9.6, "colorCode":"R59", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block964.json b/uml2es/examples/blockFactory/data/blockfactory/block/block964.json deleted file mode 100644 index 16bef29..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block964.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block964", "length":4, "width":1, "height":2, "mass":0.4, "colorCode":"R00", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block965.json b/uml2es/examples/blockFactory/data/blockfactory/block/block965.json deleted file mode 100644 index 8d0c0c6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block965.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block965", "length":5, "width":4, "height":2, "mass":2, "colorCode":"RV02", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block966.json b/uml2es/examples/blockFactory/data/blockfactory/block/block966.json deleted file mode 100644 index e796bfa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block966.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block966", "length":1, "width":1, "height":3, "mass":0.6, "colorCode":"B97", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block967.json b/uml2es/examples/blockFactory/data/blockfactory/block/block967.json deleted file mode 100644 index 46c100f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block967.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block967", "length":3, "width":2, "height":4, "mass":4.8, "colorCode":"E53", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block968.json b/uml2es/examples/blockFactory/data/blockfactory/block/block968.json deleted file mode 100644 index 016b876..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block968.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block968", "length":2, "width":2, "height":3, "mass":2.4, "colorCode":"YG67", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block969.json b/uml2es/examples/blockFactory/data/blockfactory/block/block969.json deleted file mode 100644 index 309fb7b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block969.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block969", "length":4, "width":2, "height":1, "mass":1.6, "colorCode":"RV91", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block97.json b/uml2es/examples/blockFactory/data/blockfactory/block/block97.json deleted file mode 100644 index 82ca4eb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block97.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block97", "length":3, "width":5, "height":1, "mass":0.75, "colorCode":"BG57", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block970.json b/uml2es/examples/blockFactory/data/blockfactory/block/block970.json deleted file mode 100644 index 770dac3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block970.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block970", "length":5, "width":1, "height":1, "mass":0.25, "colorCode":"RV25", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block971.json b/uml2es/examples/blockFactory/data/blockfactory/block/block971.json deleted file mode 100644 index 1c7bcd0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block971.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block971", "length":5, "width":1, "height":4, "mass":4, "colorCode":"R32", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block972.json b/uml2es/examples/blockFactory/data/blockfactory/block/block972.json deleted file mode 100644 index 424a69b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block972.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block972", "length":4, "width":3, "height":5, "mass":12, "colorCode":"E08", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block973.json b/uml2es/examples/blockFactory/data/blockfactory/block/block973.json deleted file mode 100644 index 06b4e1b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block973.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block973", "length":4, "width":4, "height":2, "mass":6.4, "colorCode":"Y32", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block974.json b/uml2es/examples/blockFactory/data/blockfactory/block/block974.json deleted file mode 100644 index 89de2b1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block974.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block974", "length":4, "width":2, "height":3, "mass":1.2, "colorCode":"RV55", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block975.json b/uml2es/examples/blockFactory/data/blockfactory/block/block975.json deleted file mode 100644 index 55b3f78..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block975.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block975", "length":5, "width":5, "height":4, "mass":20, "colorCode":"YG0000", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block976.json b/uml2es/examples/blockFactory/data/blockfactory/block/block976.json deleted file mode 100644 index c6f2f04..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block976.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block976", "length":4, "width":1, "height":4, "mass":3.2, "colorCode":"RV32", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block977.json b/uml2es/examples/blockFactory/data/blockfactory/block/block977.json deleted file mode 100644 index ebe4775..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block977.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block977", "length":1, "width":1, "height":2, "mass":0.1, "colorCode":"E50", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block978.json b/uml2es/examples/blockFactory/data/blockfactory/block/block978.json deleted file mode 100644 index 50691a5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block978.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block978", "length":1, "width":1, "height":2, "mass":0.4, "colorCode":"B39", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block979.json b/uml2es/examples/blockFactory/data/blockfactory/block/block979.json deleted file mode 100644 index ee44774..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block979.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block979", "length":5, "width":2, "height":4, "mass":8, "colorCode":"E37", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block98.json b/uml2es/examples/blockFactory/data/blockfactory/block/block98.json deleted file mode 100644 index 3c19a62..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block98.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block98", "length":2, "width":4, "height":5, "mass":8, "colorCode":"BV25", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block980.json b/uml2es/examples/blockFactory/data/blockfactory/block/block980.json deleted file mode 100644 index a6ca459..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block980.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block980", "length":3, "width":4, "height":1, "mass":0.6, "colorCode":"B18", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block981.json b/uml2es/examples/blockFactory/data/blockfactory/block/block981.json deleted file mode 100644 index bee072b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block981.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block981", "length":5, "width":3, "height":3, "mass":9, "colorCode":"BV23", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block982.json b/uml2es/examples/blockFactory/data/blockfactory/block/block982.json deleted file mode 100644 index c7530c3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block982.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block982", "length":2, "width":4, "height":4, "mass":6.4, "colorCode":"BG02", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block983.json b/uml2es/examples/blockFactory/data/blockfactory/block/block983.json deleted file mode 100644 index 4d11d69..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block983.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block983", "length":1, "width":4, "height":1, "mass":0.8, "colorCode":"R89", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block984.json b/uml2es/examples/blockFactory/data/blockfactory/block/block984.json deleted file mode 100644 index 170ad54..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block984.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block984", "length":2, "width":3, "height":2, "mass":2.4, "colorCode":"YR04", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block985.json b/uml2es/examples/blockFactory/data/blockfactory/block/block985.json deleted file mode 100644 index bd1f090..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block985.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block985", "length":1, "width":5, "height":3, "mass":3, "colorCode":"B79", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block986.json b/uml2es/examples/blockFactory/data/blockfactory/block/block986.json deleted file mode 100644 index afd0dba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block986.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block986", "length":3, "width":2, "height":4, "mass":4.8, "colorCode":"N10", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block987.json b/uml2es/examples/blockFactory/data/blockfactory/block/block987.json deleted file mode 100644 index fc78028..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block987.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block987", "length":1, "width":4, "height":2, "mass":1.6, "colorCode":"R43", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block988.json b/uml2es/examples/blockFactory/data/blockfactory/block/block988.json deleted file mode 100644 index 9fa5db3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block988.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block988", "length":1, "width":4, "height":4, "mass":3.2, "colorCode":"R30", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block989.json b/uml2es/examples/blockFactory/data/blockfactory/block/block989.json deleted file mode 100644 index d43104f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block989.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block989", "length":2, "width":5, "height":4, "mass":8, "colorCode":"G000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block99.json b/uml2es/examples/blockFactory/data/blockfactory/block/block99.json deleted file mode 100644 index c803f58..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block99.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block99", "length":2, "width":5, "height":3, "mass":1.5, "colorCode":"E95", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block990.json b/uml2es/examples/blockFactory/data/blockfactory/block/block990.json deleted file mode 100644 index 7d60b94..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block990.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block990", "length":2, "width":2, "height":5, "mass":4, "colorCode":"YG00", "materialId":"mwalnut"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block991.json b/uml2es/examples/blockFactory/data/blockfactory/block/block991.json deleted file mode 100644 index 8b6b8a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block991.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block991", "length":3, "width":1, "height":1, "mass":0.6, "colorCode":"B41", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block992.json b/uml2es/examples/blockFactory/data/blockfactory/block/block992.json deleted file mode 100644 index 0cdf0e9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block992.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block992", "length":5, "width":3, "height":5, "mass":3.75, "colorCode":"G07", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block993.json b/uml2es/examples/blockFactory/data/blockfactory/block/block993.json deleted file mode 100644 index 8ff1f11..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block993.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block993", "length":4, "width":4, "height":1, "mass":3.2, "colorCode":"T9", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block994.json b/uml2es/examples/blockFactory/data/blockfactory/block/block994.json deleted file mode 100644 index 46c5c99..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block994.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block994", "length":1, "width":4, "height":3, "mass":0.6, "colorCode":"V20", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block995.json b/uml2es/examples/blockFactory/data/blockfactory/block/block995.json deleted file mode 100644 index 457319b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block995.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block995", "length":5, "width":5, "height":3, "mass":15, "colorCode":"YG41", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block996.json b/uml2es/examples/blockFactory/data/blockfactory/block/block996.json deleted file mode 100644 index 754d31d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block996.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block996", "length":1, "width":3, "height":5, "mass":0.75, "colorCode":"N0", "materialId":"mplastic"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block997.json b/uml2es/examples/blockFactory/data/blockfactory/block/block997.json deleted file mode 100644 index f65b62c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block997.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block997", "length":5, "width":5, "height":5, "mass":25, "colorCode":"BG0000", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block998.json b/uml2es/examples/blockFactory/data/blockfactory/block/block998.json deleted file mode 100644 index 9a8fa83..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block998.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block998", "length":3, "width":5, "height":5, "mass":15, "colorCode":"YG07", "materialId":"mspruce"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/block/block999.json b/uml2es/examples/blockFactory/data/blockfactory/block/block999.json deleted file mode 100644 index e6ab0ec..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/block/block999.json +++ /dev/null @@ -1 +0,0 @@ -{"blockNumber":"block999", "length":2, "width":5, "height":5, "mass":10, "colorCode":"BV13", "materialId":"mpine"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/client/ucla.json b/uml2es/examples/blockFactory/data/blockfactory/client/ucla.json deleted file mode 100644 index 3057533..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/client/ucla.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"cucla", "name":"ucla", "country":"USA"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/0.json b/uml2es/examples/blockFactory/data/blockfactory/color/0.json deleted file mode 100644 index ed344a2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/0.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"0", "rgbString":"ffffff", "name":"Colorless Blender", "rgb":[255, 255, 255], "cie":[100, 0.00526049995830391, -0.0104081845252679], "hue":"-", "saturation":"0", "brightness":"-", "alternatives":[{"colorCode":"E0000", "score":3.80302449078099}, {"colorCode":"G0000", "score":4.42050017808695}, {"colorCode":"B0000", "score":4.74663089222765}, {"colorCode":"Y0000", "score":5.08313913433065}, {"colorCode":"BG0000", "score":5.17489392263319}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/100.json b/uml2es/examples/blockFactory/data/blockfactory/color/100.json deleted file mode 100644 index 04b7856..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/100.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"100", "rgbString":"312b2b", "name":"Black", "rgb":[49, 43, 43], "cie":[18.1661632036713, 2.73742504836363, 0.995613228668069], "hue":"-", "saturation":"1", "brightness":"00", "alternatives":[{"colorCode":"T10", "score":1.38571728336613}, {"colorCode":"N10", "score":2.13058773355715}, {"colorCode":"C10", "score":3.19650322725341}, {"colorCode":"W10", "score":3.67945873128072}, {"colorCode":"C9", "score":11.5487040420795}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/110.json b/uml2es/examples/blockFactory/data/blockfactory/color/110.json deleted file mode 100644 index 0182488..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/110.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"110", "rgbString":"030708", "name":"Special Black", "rgb":[3, 7, 8], "cie":[1.70585265756086, -0.906705242769632, -0.747522926594402], "hue":"-", "saturation":"1", "brightness":"10", "alternatives":[{"colorCode":"C10", "score":15.8031746922004}, {"colorCode":"100", "score":16.5428488355041}, {"colorCode":"T10", "score":17.6277281061494}, {"colorCode":"W10", "score":17.7323657075634}, {"colorCode":"N10", "score":17.9305593939806}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B00.json b/uml2es/examples/blockFactory/data/blockfactory/color/B00.json deleted file mode 100644 index 8d12c36..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B00", "rgbString":"ddf0f4", "name":"Frost Blue", "rgb":[221, 240, 244], "cie":[93.5476955583274, -5.45870979152013, -4.07499283352542], "hue":"B", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"BG70", "score":1.43889239296874}, {"colorCode":"B21", "score":1.57310604922672}, {"colorCode":"B01", "score":1.6157804451531}, {"colorCode":"B000", "score":2.22976532893987}, {"colorCode":"BG10", "score":2.39178164530192}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B000.json b/uml2es/examples/blockFactory/data/blockfactory/color/B000.json deleted file mode 100644 index 6558f2e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B000", "rgbString":"e6f4f5", "name":"Pale Porcelain Blue", "rgb":[230, 244, 245], "cie":[95.2101554701202, -4.40401936805368, -2.08002935505842], "hue":"B", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"G00", "score":1.24000757177944}, {"colorCode":"C00", "score":1.67386838105149}, {"colorCode":"BG0000", "score":1.71851983958748}, {"colorCode":"B32", "score":1.7654130138137}, {"colorCode":"G0000", "score":2.16547210318368}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/B0000.json deleted file mode 100644 index 62715de..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B0000", "rgbString":"f0f9fe", "name":"Pale Celestine", "rgb":[240, 249, 254], "cie":[97.402806288204, -2.03481093669183, -3.42841923908237], "hue":"B", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"B000", "score":2.31714465207955}, {"colorCode":"G000", "score":2.34645073681537}, {"colorCode":"C00", "score":3.18993787274334}, {"colorCode":"BG000", "score":3.21132356515879}, {"colorCode":"V0000", "score":3.26708449051225}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B01.json b/uml2es/examples/blockFactory/data/blockfactory/color/B01.json deleted file mode 100644 index 86e8678..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B01", "rgbString":"d6eef2", "name":"Mint Blue", "rgb":[214, 238, 242], "cie":[92.5112734218931, -7.05663722528277, -4.61463917709943], "hue":"B", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"BG10", "score":1.35488245007116}, {"colorCode":"B00", "score":1.56609965243938}, {"colorCode":"BG70", "score":1.58203145269231}, {"colorCode":"BG11", "score":1.87648785836387}, {"colorCode":"B32", "score":2.12386403932453}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B02.json b/uml2es/examples/blockFactory/data/blockfactory/color/B02.json deleted file mode 100644 index 7544dfd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B02", "rgbString":"b3e3f1", "name":"Robin's Egg Blue", "rgb":[179, 227, 241], "cie":[87.4231472867694, -12.3053382451742, -11.8746242879372], "hue":"B", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"BG01", "score":2.74042418546254}, {"colorCode":"BG13", "score":3.455447121176}, {"colorCode":"BG02", "score":3.84540325282318}, {"colorCode":"B12", "score":3.88052960925486}, {"colorCode":"BG34", "score":4.16158263939361}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B04.json b/uml2es/examples/blockFactory/data/blockfactory/color/B04.json deleted file mode 100644 index 244499d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B04.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B04", "rgbString":"73cfe6", "name":"Tahitian Blue", "rgb":[115, 207, 230], "cie":[78.4522020401882, -21.3132204001363, -19.8366254035264], "hue":"B", "saturation":"0", "brightness":"4", "alternatives":[{"colorCode":"B14", "score":1.79096619067636}, {"colorCode":"BG05", "score":2.11633025395663}, {"colorCode":"FBG2", "score":2.19089371865519}, {"colorCode":"B93", "score":5.02103223397778}, {"colorCode":"B05", "score":5.4967192956264}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B05.json b/uml2es/examples/blockFactory/data/blockfactory/color/B05.json deleted file mode 100644 index 2181ad7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B05.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B05", "rgbString":"40c5e6", "name":"Process Blue", "rgb":[64, 197, 230], "cie":[74.0203705929006, -25.0417424060619, -26.7304581051059], "hue":"B", "saturation":"0", "brightness":"5", "alternatives":[{"colorCode":"FBG2", "score":3.18425928094472}, {"colorCode":"B34", "score":3.50848822874603}, {"colorCode":"B16", "score":3.64114054170965}, {"colorCode":"BG57", "score":3.95065402612988}, {"colorCode":"B23", "score":5.06334055256238}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B06.json b/uml2es/examples/blockFactory/data/blockfactory/color/B06.json deleted file mode 100644 index a4fef0a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B06.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B06", "rgbString":"00b3e6", "name":"Peacok Blue", "rgb":[0, 179, 230], "cie":[67.9862335317582, -20.0594681618642, -36.1065736814235], "hue":"B", "saturation":"0", "brightness":"6", "alternatives":[{"colorCode":"B26", "score":3.42372819246357}, {"colorCode":"B16", "score":3.72543210839897}, {"colorCode":"BG57", "score":5.94140100737479}, {"colorCode":"B05", "score":6.25196380205677}, {"colorCode":"BV04", "score":6.5409245757282}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B12.json b/uml2es/examples/blockFactory/data/blockfactory/color/B12.json deleted file mode 100644 index 2aa7d68..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B12.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B12", "rgbString":"c8e6f0", "name":"Ice Blue", "rgb":[200, 230, 240], "cie":[89.469879597678, -7.76142269971442, -8.16683400295153], "hue":"B", "saturation":"1", "brightness":"2", "alternatives":[{"colorCode":"BG11", "score":1.83947307966776}, {"colorCode":"B91", "score":3.22181679148162}, {"colorCode":"B01", "score":3.57620869909378}, {"colorCode":"B21", "score":3.75221135163976}, {"colorCode":"BG02", "score":3.85219648072833}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B14.json b/uml2es/examples/blockFactory/data/blockfactory/color/B14.json deleted file mode 100644 index 387fdfe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B14.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B14", "rgbString":"71cfeb", "name":"Light Blue", "rgb":[113, 207, 235], "cie":[78.5401040140891, -20.3646225509381, -22.3891407149142], "hue":"B", "saturation":"1", "brightness":"4", "alternatives":[{"colorCode":"B04", "score":1.76840199002466}, {"colorCode":"FBG2", "score":1.98310971916892}, {"colorCode":"BG05", "score":2.43129161025007}, {"colorCode":"B23", "score":3.16795892649492}, {"colorCode":"B63", "score":5.00669432202841}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B16.json b/uml2es/examples/blockFactory/data/blockfactory/color/B16.json deleted file mode 100644 index 6000702..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B16.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B16", "rgbString":"00bcea", "name":"Cyanine Blue", "rgb":[0, 188, 234], "cie":[70.8067205844041, -23.3337025921852, -33.9085760868732], "hue":"B", "saturation":"1", "brightness":"6", "alternatives":[{"colorCode":"B26", "score":2.97483079621378}, {"colorCode":"B05", "score":3.58520853401367}, {"colorCode":"B06", "score":3.72754604273207}, {"colorCode":"BG09", "score":4.79224026328067}, {"colorCode":"B45", "score":5.21847714706201}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B18.json b/uml2es/examples/blockFactory/data/blockfactory/color/B18.json deleted file mode 100644 index b1c3fd4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B18.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B18", "rgbString":"1d8acb", "name":"Lapis Lazuli", "rgb":[29, 138, 203], "cie":[54.8138548280418, -5.99140750043448, -41.7089769875254], "hue":"B", "saturation":"1", "brightness":"8", "alternatives":[{"colorCode":"FB2", "score":1.53095316330226}, {"colorCode":"B66", "score":2.91412411111746}, {"colorCode":"B29", "score":6.64864973106901}, {"colorCode":"BV13", "score":7.32465583567188}, {"colorCode":"BV25", "score":7.7224907186193}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B21.json b/uml2es/examples/blockFactory/data/blockfactory/color/B21.json deleted file mode 100644 index af94560..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B21", "rgbString":"dbedf9", "name":"Baby Blue", "rgb":[219, 237, 249], "cie":[92.7810223063621, -3.59039764330077, -7.82202941024144], "hue":"B", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"B00", "score":1.5037845567429}, {"colorCode":"B41", "score":1.58934294312763}, {"colorCode":"BG70", "score":1.77202966858377}, {"colorCode":"BG11", "score":1.99320064301981}, {"colorCode":"B32", "score":2.08631738630479}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B23.json b/uml2es/examples/blockFactory/data/blockfactory/color/B23.json deleted file mode 100644 index ab5bf66..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B23", "rgbString":"92c2e8", "name":"Phthalo Blue", "rgb":[146, 194, 232], "cie":[76.3877979529298, -6.48274183958286, -23.911703452733], "hue":"B", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"B34", "score":2.01636950981249}, {"colorCode":"B63", "score":2.06169230789803}, {"colorCode":"B93", "score":2.67793646424736}, {"colorCode":"BV02", "score":3.02225189116745}, {"colorCode":"B45", "score":3.33528508459816}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B24.json b/uml2es/examples/blockFactory/data/blockfactory/color/B24.json deleted file mode 100644 index 7f9453b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B24.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B24", "rgbString":"8acef3", "name":"Sky", "rgb":[138, 206, 243], "cie":[79.6234656448544, -11.9889859688643, -24.9176411719045], "hue":"B", "saturation":"2", "brightness":"4", "alternatives":[{"colorCode":"B23", "score":3.48033674534932}, {"colorCode":"FBG2", "score":3.54198662448758}, {"colorCode":"B34", "score":3.66812485088298}, {"colorCode":"B63", "score":5.1000443840762}, {"colorCode":"B45", "score":5.32148937240198}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B26.json b/uml2es/examples/blockFactory/data/blockfactory/color/B26.json deleted file mode 100644 index 23823ae..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B26.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B26", "rgbString":"65b3e3", "name":"Cobalt Blue", "rgb":[101, 179, 227], "cie":[69.8615676757391, -10.5130488822275, -31.4029109241449], "hue":"B", "saturation":"2", "brightness":"6", "alternatives":[{"colorCode":"B16", "score":3.36619136631664}, {"colorCode":"B06", "score":3.78547679406413}, {"colorCode":"B45", "score":4.71304843293214}, {"colorCode":"B95", "score":5.56462461458337}, {"colorCode":"B34", "score":6.36312128702498}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B28.json b/uml2es/examples/blockFactory/data/blockfactory/color/B28.json deleted file mode 100644 index 25d3087..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B28.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B28", "rgbString":"196db6", "name":"Royal Blue", "rgb":[25, 109, 182], "cie":[44.9715157499856, 3.20369968668427, -45.2777958556423], "hue":"B", "saturation":"2", "brightness":"8", "alternatives":[{"colorCode":"B69", "score":2.68456836384114}, {"colorCode":"B39", "score":3.10387738032507}, {"colorCode":"B37", "score":3.16819387018561}, {"colorCode":"B29", "score":3.36557875803819}, {"colorCode":"FV2", "score":7.62809995255986}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B29.json b/uml2es/examples/blockFactory/data/blockfactory/color/B29.json deleted file mode 100644 index acaf8dd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B29.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B29", "rgbString":"0177c1", "name":"Ultramarine", "rgb":[1, 119, 193], "cie":[48.3234271450729, 0.16600291537, -46.3126113099543], "hue":"B", "saturation":"2", "brightness":"9", "alternatives":[{"colorCode":"B28", "score":3.3652142547775}, {"colorCode":"B37", "score":5.08968003003928}, {"colorCode":"B69", "score":6.04583818753738}, {"colorCode":"B39", "score":6.43762384828496}, {"colorCode":"B18", "score":6.6301530722071}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B32.json b/uml2es/examples/blockFactory/data/blockfactory/color/B32.json deleted file mode 100644 index 240d615..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B32.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B32", "rgbString":"e2eff7", "name":"Pale Blue", "rgb":[226, 239, 247], "cie":[93.7178939881021, -2.77412500400642, -5.34336615934281], "hue":"B", "saturation":"3", "brightness":"2", "alternatives":[{"colorCode":"B41", "score":1.09380177722017}, {"colorCode":"B000", "score":1.74519030678334}, {"colorCode":"B21", "score":2.24014439304289}, {"colorCode":"B01", "score":2.24824895215575}, {"colorCode":"C00", "score":2.31768727534575}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B34.json b/uml2es/examples/blockFactory/data/blockfactory/color/B34.json deleted file mode 100644 index 7df9c79..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B34.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B34", "rgbString":"82c3ed", "name":"Manganese Blue", "rgb":[130, 195, 237], "cie":[76.0019795584683, -9.74991032599826, -27.2699062189858], "hue":"B", "saturation":"3", "brightness":"4", "alternatives":[{"colorCode":"B45", "score":1.68686292100111}, {"colorCode":"B23", "score":1.85777200130614}, {"colorCode":"B24", "score":3.66578467751726}, {"colorCode":"B05", "score":3.87416793804053}, {"colorCode":"B93", "score":4.22388177207895}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B37.json b/uml2es/examples/blockFactory/data/blockfactory/color/B37.json deleted file mode 100644 index 8b3d16e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B37.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B37", "rgbString":"156fa4", "name":"Antwerp Blue", "rgb":[21, 111, 164], "cie":[44.5306778876915, -5.326533013496, -35.4472730329724], "hue":"B", "saturation":"3", "brightness":"7", "alternatives":[{"colorCode":"B39", "score":3.67573497828832}, {"colorCode":"B28", "score":3.67963194887066}, {"colorCode":"B69", "score":4.24290554606521}, {"colorCode":"B29", "score":5.5165678338346}, {"colorCode":"B97", "score":6.2882812231423}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B39.json b/uml2es/examples/blockFactory/data/blockfactory/color/B39.json deleted file mode 100644 index 178aa93..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B39.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B39", "rgbString":"2b64a9", "name":"Prussian Blue", "rgb":[43, 100, 169], "cie":[41.9884084118966, 5.76785102741095, -42.3917015554257], "hue":"B", "saturation":"3", "brightness":"9", "alternatives":[{"colorCode":"B69", "score":0.896810128532839}, {"colorCode":"B28", "score":3.11355769717173}, {"colorCode":"B37", "score":3.47664192846303}, {"colorCode":"B29", "score":6.4489709626982}, {"colorCode":"V28", "score":7.10968961936675}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B41.json b/uml2es/examples/blockFactory/data/blockfactory/color/B41.json deleted file mode 100644 index 621d7cf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B41.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B41", "rgbString":"e2f0fb", "name":"Powder Blue", "rgb":[226, 240, 251], "cie":[94.0783869757109, -2.51498454263743, -6.88828239302861], "hue":"B", "saturation":"4", "brightness":"1", "alternatives":[{"colorCode":"B32", "score":1.05061371041364}, {"colorCode":"B21", "score":1.61251962987453}, {"colorCode":"BG70", "score":2.06647081232571}, {"colorCode":"B000", "score":2.17005169824708}, {"colorCode":"BV0000", "score":2.23840078237346}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B45.json b/uml2es/examples/blockFactory/data/blockfactory/color/B45.json deleted file mode 100644 index f1fe8ad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B45.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B45", "rgbString":"75c0ea", "name":"Smoky Blue", "rgb":[117, 192, 234], "cie":[74.4587007758934, -12.0032823113139, -28.0703090538572], "hue":"B", "saturation":"4", "brightness":"5", "alternatives":[{"colorCode":"B34", "score":1.67878963478336}, {"colorCode":"B23", "score":3.0979392536592}, {"colorCode":"B63", "score":4.23668229666428}, {"colorCode":"B26", "score":4.72453903619919}, {"colorCode":"B93", "score":4.94557846462268}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B52.json b/uml2es/examples/blockFactory/data/blockfactory/color/B52.json deleted file mode 100644 index edd7278..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B52.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B52", "rgbString":"adcddc", "name":"Soft Greenish Blue", "rgb":[173, 205, 220], "cie":[80.5796253617858, -7.39681628075256, -10.9804384629165], "hue":"B", "saturation":"5", "brightness":"2", "alternatives":[{"colorCode":"BV23", "score":3.65477505528778}, {"colorCode":"BG34", "score":4.38647708673389}, {"colorCode":"BG15", "score":4.65759637406275}, {"colorCode":"C3", "score":5.23148962340884}, {"colorCode":"BG45", "score":5.36775763563161}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B60.json b/uml2es/examples/blockFactory/data/blockfactory/color/B60.json deleted file mode 100644 index 3d4eeaa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B60.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B60", "rgbString":"dae1f3", "name":"Pale Blue Gray", "rgb":[218, 225, 243], "cie":[89.4991789168681, 1.08998945976668, -9.56246762992741], "hue":"B", "saturation":"6", "brightness":"0", "alternatives":[{"colorCode":"V20", "score":1.96652573216439}, {"colorCode":"B91", "score":2.25123138033378}, {"colorCode":"V000", "score":2.61526059189768}, {"colorCode":"BV20", "score":2.93793004204811}, {"colorCode":"B21", "score":3.35779612241664}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B63.json b/uml2es/examples/blockFactory/data/blockfactory/color/B63.json deleted file mode 100644 index e3120e6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B63.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B63", "rgbString":"a7bbe0", "name":"Light Hydrangea", "rgb":[167, 187, 224], "cie":[75.5370723433329, 1.28292279430237, -20.7635979863964], "hue":"B", "saturation":"6", "brightness":"3", "alternatives":[{"colorCode":"BV02", "score":1.05961594995431}, {"colorCode":"B23", "score":2.22075616790036}, {"colorCode":"BV23", "score":3.03517402465955}, {"colorCode":"V22", "score":3.10402219592604}, {"colorCode":"B45", "score":5.13774262461311}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B66.json b/uml2es/examples/blockFactory/data/blockfactory/color/B66.json deleted file mode 100644 index 8d3a332..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B66.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B66", "rgbString":"6888c5", "name":"Clematis", "rgb":[104, 136, 197], "cie":[56.6664399702723, 5.38568019786845, -35.2128230144705], "hue":"B", "saturation":"6", "brightness":"6", "alternatives":[{"colorCode":"BV17", "score":1.46534595209239}, {"colorCode":"B18", "score":3.1138547034}, {"colorCode":"V25", "score":3.74533655377741}, {"colorCode":"BV13", "score":4.73290130710041}, {"colorCode":"BV04", "score":5.9426587449197}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B69.json b/uml2es/examples/blockFactory/data/blockfactory/color/B69.json deleted file mode 100644 index aca9179..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B69.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B69", "rgbString":"2165ae", "name":"Stratospheric Blue", "rgb":[33, 101, 174], "cie":[42.2873160080862, 5.85304896221151, -44.8755489730225], "hue":"B", "saturation":"6", "brightness":"9", "alternatives":[{"colorCode":"B39", "score":0.867651447404339}, {"colorCode":"B28", "score":2.68456984406469}, {"colorCode":"B37", "score":3.82583845702727}, {"colorCode":"B29", "score":6.04614513443648}, {"colorCode":"V28", "score":7.52144955160934}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B79.json b/uml2es/examples/blockFactory/data/blockfactory/color/B79.json deleted file mode 100644 index 91b130b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B79.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B79", "rgbString":"3b479d", "name":"Iris", "rgb":[59, 71, 157], "cie":[33.7119369926043, 22.8843631066343, -48.4735250301066], "hue":"B", "saturation":"7", "brightness":"9", "alternatives":[{"colorCode":"B39", "score":8.86330488504541}, {"colorCode":"B69", "score":8.91756711881814}, {"colorCode":"V09", "score":10.710122883435}, {"colorCode":"E18", "score":11.2190446150521}, {"colorCode":"B28", "score":11.5139680962421}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B91.json b/uml2es/examples/blockFactory/data/blockfactory/color/B91.json deleted file mode 100644 index dd53a13..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B91.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B91", "rgbString":"d5e2eb", "name":"Pale Grayish Blue", "rgb":[213, 226, 235], "cie":[89.1756735777511, -2.6019699753948, -5.88181456504158], "hue":"B", "saturation":"9", "brightness":"1", "alternatives":[{"colorCode":"C1", "score":1.92006554632839}, {"colorCode":"B60", "score":2.49714913195489}, {"colorCode":"C0", "score":2.86920103183913}, {"colorCode":"BG11", "score":3.58563809902672}, {"colorCode":"RV91", "score":3.60399309577401}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B93.json b/uml2es/examples/blockFactory/data/blockfactory/color/B93.json deleted file mode 100644 index 7b58ba3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B93.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B93", "rgbString":"95c1da", "name":"Light Crockery Blue", "rgb":[149, 193, 218], "cie":[75.8178059195096, -8.62763110115011, -17.1984640570242], "hue":"B", "saturation":"9", "brightness":"3", "alternatives":[{"colorCode":"B23", "score":3.02005747198043}, {"colorCode":"BG05", "score":5.17594342107868}, {"colorCode":"B34", "score":5.21228198164234}, {"colorCode":"BG72", "score":5.48420349138294}, {"colorCode":"B52", "score":5.74643902376996}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B95.json b/uml2es/examples/blockFactory/data/blockfactory/color/B95.json deleted file mode 100644 index b659b4b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B95.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B95", "rgbString":"74a7c6", "name":"Light Grayish Cobalt", "rgb":[116, 167, 198], "cie":[66.0802720693193, -8.82955184450135, -21.1831224663181], "hue":"B", "saturation":"9", "brightness":"5", "alternatives":[{"colorCode":"BV04", "score":5.61404881220518}, {"colorCode":"BV34", "score":5.97694539433632}, {"colorCode":"B26", "score":6.26987208909012}, {"colorCode":"BV13", "score":6.41761300650318}, {"colorCode":"BG07", "score":7.26050604326197}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B97.json b/uml2es/examples/blockFactory/data/blockfactory/color/B97.json deleted file mode 100644 index 9d393ba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B97.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B97", "rgbString":"457a9a", "name":"Night Blue", "rgb":[69, 122, 154], "cie":[48.9054190192078, -8.09118172612661, -22.6394893453304], "hue":"B", "saturation":"9", "brightness":"7", "alternatives":[{"colorCode":"BG78", "score":6.30290093955934}, {"colorCode":"B37", "score":7.16114285904397}, {"colorCode":"BV25", "score":7.39382158800326}, {"colorCode":"FV2", "score":7.75167727993787}, {"colorCode":"BG75", "score":7.80778920366149}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/B99.json b/uml2es/examples/blockFactory/data/blockfactory/color/B99.json deleted file mode 100644 index d527ca1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/B99.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"B99", "rgbString":"0f547e", "name":"Agate", "rgb":[15, 84, 126], "cie":[33.8755322606342, -4.0762862155225, -29.3718314150584], "hue":"B", "saturation":"9", "brightness":"9", "alternatives":[{"colorCode":"V99", "score":7.11354649547942}, {"colorCode":"BV29", "score":8.69571053599962}, {"colorCode":"B39", "score":9.87165149318783}, {"colorCode":"E87", "score":10.4450825371171}, {"colorCode":"B69", "score":10.7437984711901}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG000.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG000.json deleted file mode 100644 index b9c2f3d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG000", "rgbString":"e5f4ed", "name":"Pale Aqua", "rgb":[229, 244, 237], "cie":[94.9389358987477, -6.19839135740491, 1.65639132971394], "hue":"BG", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"G00", "score":0.767993180234101}, {"colorCode":"G000", "score":0.834301645754264}, {"colorCode":"BG10", "score":1.64515011881793}, {"colorCode":"W00", "score":1.94281458502294}, {"colorCode":"W0", "score":2.49706767515012}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG0000.json deleted file mode 100644 index 15ca5c5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG0000", "rgbString":"eff8f3", "name":"Snow Green", "rgb":[239, 248, 243], "cie":[96.8025565369657, -3.85093305983647, 1.3559746635186], "hue":"BG", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"G0000", "score":0.964101437645784}, {"colorCode":"B000", "score":1.72589025185098}, {"colorCode":"G000", "score":1.84244557156157}, {"colorCode":"C00", "score":2.62946972640294}, {"colorCode":"BG000", "score":2.7126042907667}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG01.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG01.json deleted file mode 100644 index b068d23..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG01", "rgbString":"c7e6fa", "name":"Aqua Blue", "rgb":[199, 230, 250], "cie":[89.6909381897559, -5.9629454569311, -13.0832863293616], "hue":"BG", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"B02", "score":2.80627139039555}, {"colorCode":"BV20", "score":2.90121169856336}, {"colorCode":"BG11", "score":2.91146420732752}, {"colorCode":"B12", "score":3.95112607057606}, {"colorCode":"B01", "score":4.58147771382922}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG02.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG02.json deleted file mode 100644 index 7ad8f81..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG02", "rgbString":"c6e8ea", "name":"New Blue", "rgb":[198, 232, 234], "cie":[89.7010143180406, -10.6268383269196, -4.69630208165224], "hue":"BG", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"BG13", "score":0.469166874648238}, {"colorCode":"BG11", "score":1.73019270909146}, {"colorCode":"BG23", "score":2.56224931998534}, {"colorCode":"BG32", "score":3.33758199050539}, {"colorCode":"B91", "score":3.44622757042618}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG05.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG05.json deleted file mode 100644 index 1c9fb59..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG05.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG05", "rgbString":"83d2e1", "name":"Holiday Blue", "rgb":[131, 210, 225], "cie":[79.8152782804586, -20.4412429558791, -15.036544712843], "hue":"BG", "saturation":"0", "brightness":"5", "alternatives":[{"colorCode":"B04", "score":2.21515414685134}, {"colorCode":"B14", "score":2.61471505959856}, {"colorCode":"BG15", "score":3.95009023198222}, {"colorCode":"FBG2", "score":4.45861806019602}, {"colorCode":"BG34", "score":4.72968697529373}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG07.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG07.json deleted file mode 100644 index 91f4a4f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG07.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG07", "rgbString":"1db8ce", "name":"Petroleum Blue", "rgb":[29, 184, 206], "cie":[68.7501221118346, -29.5183734728999, -21.7638747239637], "hue":"BG", "saturation":"0", "brightness":"7", "alternatives":[{"colorCode":"BG09", "score":2.48525560158405}, {"colorCode":"BG57", "score":4.39387732611511}, {"colorCode":"BG72", "score":5.73022622793966}, {"colorCode":"B95", "score":5.82617167518059}, {"colorCode":"B45", "score":6.16149636217965}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG09.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG09.json deleted file mode 100644 index 75052f3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG09.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG09", "rgbString":"01b1c9", "name":"Blue Green", "rgb":[1, 177, 201], "cie":[66.2652995173769, -28.8671529401797, -22.8193221047477], "hue":"BG", "saturation":"0", "brightness":"9", "alternatives":[{"colorCode":"BG07", "score":2.4852537995179}, {"colorCode":"B16", "score":4.82955274309287}, {"colorCode":"BG57", "score":6.36645450444366}, {"colorCode":"BG72", "score":6.96369304181128}, {"colorCode":"B05", "score":7.75533292742561}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG10.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG10.json deleted file mode 100644 index 41ce6bb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG10.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG10", "rgbString":"dcf0ef", "name":"Cool Shadow", "rgb":[220, 240, 239], "cie":[93.3495630984978, -6.73294032437483, -1.77615452828774], "hue":"BG", "saturation":"1", "brightness":"0", "alternatives":[{"colorCode":"G00", "score":1.24899546682739}, {"colorCode":"BG70", "score":1.28910258704948}, {"colorCode":"B01", "score":1.39734400530843}, {"colorCode":"BG000", "score":1.64311137144893}, {"colorCode":"B00", "score":2.38688324206495}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG11.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG11.json deleted file mode 100644 index 6718a7c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG11.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG11", "rgbString":"ceebf1", "name":"Moon White", "rgb":[206, 235, 241], "cie":[91.1842012682665, -8.24417394096805, -6.11015993613033], "hue":"BG", "saturation":"1", "brightness":"1", "alternatives":[{"colorCode":"BG02", "score":1.74964331810509}, {"colorCode":"B01", "score":1.82441111067759}, {"colorCode":"B12", "score":1.8470539177911}, {"colorCode":"B21", "score":1.95743441501059}, {"colorCode":"BG13", "score":2.2224540912033}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG13.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG13.json deleted file mode 100644 index 48d030d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG13.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG13", "rgbString":"c4e7e9", "name":"Mint Green", "rgb":[196, 231, 233], "cie":[89.2855162756392, -10.9441480556049, -4.79906226359104], "hue":"BG", "saturation":"1", "brightness":"3", "alternatives":[{"colorCode":"BG02", "score":0.468187974093572}, {"colorCode":"BG23", "score":2.11737238148941}, {"colorCode":"BG11", "score":2.19333072428006}, {"colorCode":"BG32", "score":2.86371511464388}, {"colorCode":"B02", "score":3.8322634439104}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG15.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG15.json deleted file mode 100644 index b77d4db..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG15.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG15", "rgbString":"a0d9d2", "name":"Aqua", "rgb":[160, 217, 210], "cie":[82.7815912157324, -19.6339569372724, -2.47104553132573], "hue":"BG", "saturation":"1", "brightness":"5", "alternatives":[{"colorCode":"BG34", "score":0.828823193129887}, {"colorCode":"BG45", "score":3.40525029021688}, {"colorCode":"B52", "score":4.10494370914056}, {"colorCode":"BG05", "score":4.18728779535467}, {"colorCode":"BG53", "score":4.53583816117081}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG18.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG18.json deleted file mode 100644 index 4de68ba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG18.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG18", "rgbString":"37c0b0", "name":"Teal Blue", "rgb":[55, 192, 176], "cie":[70.6262258402795, -39.663132060884, -2.4600075027577], "hue":"BG", "saturation":"1", "brightness":"8", "alternatives":[{"colorCode":"BG57", "score":4.31399615938233}, {"colorCode":"G19", "score":4.79307362477578}, {"colorCode":"BG49", "score":7.39502411068805}, {"colorCode":"B95", "score":7.54485068626193}, {"colorCode":"G17", "score":7.57065672339503}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG23.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG23.json deleted file mode 100644 index 91cbab7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG23", "rgbString":"bde5dd", "name":"Coral Sea", "rgb":[189, 229, 221], "cie":[88.0060716084658, -14.538060620685, -0.431360355620747], "hue":"BG", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"BG32", "score":1.70363382559714}, {"colorCode":"BG13", "score":2.0237976426282}, {"colorCode":"BG02", "score":2.44965119133543}, {"colorCode":"BG45", "score":2.59664606518446}, {"colorCode":"YG61", "score":2.93229650398845}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG32.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG32.json deleted file mode 100644 index 74e892d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG32.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG32", "rgbString":"bce2d7", "name":"Aqua Mint", "rgb":[188, 226, 215], "cie":[86.9921434447254, -14.5348954061755, 1.23663010368875], "hue":"BG", "saturation":"3", "brightness":"2", "alternatives":[{"colorCode":"BG23", "score":1.70305210535491}, {"colorCode":"BG13", "score":2.79186198732095}, {"colorCode":"BG02", "score":3.24821874004367}, {"colorCode":"YG61", "score":3.84646806256068}, {"colorCode":"G12", "score":4.34073368395317}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG34.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG34.json deleted file mode 100644 index ae3c269..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG34.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG34", "rgbString":"a3dad7", "name":"Horizon Green", "rgb":[163, 218, 215], "cie":[83.3558225856046, -18.1652252571637, -4.26393997010053], "hue":"BG", "saturation":"3", "brightness":"4", "alternatives":[{"colorCode":"BG15", "score":0.840812665649168}, {"colorCode":"BG45", "score":2.61985231097762}, {"colorCode":"B52", "score":4.04794263764214}, {"colorCode":"B02", "score":4.1546072089146}, {"colorCode":"BG32", "score":4.25689451802578}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG45.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG45.json deleted file mode 100644 index a9f1ae8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG45.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG45", "rgbString":"afdfdf", "name":"Nile Blue", "rgb":[175, 223, 223], "cie":[85.6134240640029, -15.3920594365076, -5.09570286924592], "hue":"BG", "saturation":"4", "brightness":"5", "alternatives":[{"colorCode":"BG23", "score":2.57993969321006}, {"colorCode":"BG34", "score":2.66375615851158}, {"colorCode":"BG15", "score":3.50599791454636}, {"colorCode":"BG13", "score":4.4227269382208}, {"colorCode":"B12", "score":4.80133979148125}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG49.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG49.json deleted file mode 100644 index ad3c091..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG49.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG49", "rgbString":"00b6b9", "name":"Duck Blue", "rgb":[0, 182, 185], "cie":[67.2460186234172, -36.4018429193208, -12.4913386994505], "hue":"BG", "saturation":"4", "brightness":"9", "alternatives":[{"colorCode":"BG57", "score":5.87422825600709}, {"colorCode":"BG72", "score":6.80432942792111}, {"colorCode":"BG07", "score":7.41548309295603}, {"colorCode":"BG18", "score":7.46511055074895}, {"colorCode":"B45", "score":7.77851151864512}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG53.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG53.json deleted file mode 100644 index 5facbbc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG53.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG53", "rgbString":"accfd1", "name":"Ice Mint", "rgb":[172, 207, 209], "cie":[80.7386530745428, -11.1159716011776, -4.86223997980819], "hue":"BG", "saturation":"5", "brightness":"3", "alternatives":[{"colorCode":"C3", "score":4.66476313051151}, {"colorCode":"BG34", "score":4.96681724817974}, {"colorCode":"BG15", "score":5.3570357807469}, {"colorCode":"BG45", "score":5.54354561538358}, {"colorCode":"BG93", "score":5.72191186192416}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG57.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG57.json deleted file mode 100644 index 7bf2853..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG57.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG57", "rgbString":"64bebe", "name":"Sketch Jasper", "rgb":[100, 190, 190], "cie":[71.7269883971746, -26.8424231867522, -8.34240617802913], "hue":"BG", "saturation":"5", "brightness":"7", "alternatives":[{"colorCode":"BG72", "score":2.81538246545611}, {"colorCode":"B05", "score":4.40535388202252}, {"colorCode":"BG07", "score":4.81284676265651}, {"colorCode":"BG18", "score":5.25172505641104}, {"colorCode":"G85", "score":5.34573823918989}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG70.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG70.json deleted file mode 100644 index 575b4b7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG70.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG70", "rgbString":"daecee", "name":"Ocean Mist", "rgb":[218, 236, 238], "cie":[92.1625547393549, -5.53617213718644, -3.01294589888348], "hue":"BG", "saturation":"7", "brightness":"0", "alternatives":[{"colorCode":"BG10", "score":1.29368661656785}, {"colorCode":"B00", "score":1.44079053623698}, {"colorCode":"B01", "score":1.69454028236064}, {"colorCode":"B21", "score":1.8982866346018}, {"colorCode":"C0", "score":2.0498586125908}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG72.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG72.json deleted file mode 100644 index 70dec0b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG72.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG72", "rgbString":"74b8bb", "name":"Ice Ocean", "rgb":[116, 184, 187], "cie":[70.581656097166, -20.6690268186687, -8.32835591275623], "hue":"BG", "saturation":"7", "brightness":"2", "alternatives":[{"colorCode":"BG57", "score":3.12588490784018}, {"colorCode":"B93", "score":5.45209314164574}, {"colorCode":"B45", "score":5.65509701427318}, {"colorCode":"B34", "score":6.36343804153366}, {"colorCode":"BG07", "score":7.41499153570677}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG75.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG75.json deleted file mode 100644 index eedb3f7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG75.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG75", "rgbString":"59918e", "name":"Abyss Green", "rgb":[89, 145, 142], "cie":[56.414351045228, -19.1237027347694, -4.23813389338708], "hue":"BG", "saturation":"7", "brightness":"5", "alternatives":[{"colorCode":"C6", "score":6.0355905668429}, {"colorCode":"BG96", "score":7.65558686296428}, {"colorCode":"B97", "score":7.87330022686121}, {"colorCode":"BG99", "score":8.56310789702104}, {"colorCode":"G46", "score":9.0801935749176}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG78.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG78.json deleted file mode 100644 index 931ce4f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG78.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG78", "rgbString":"49706b", "name":"Bronze", "rgb":[73, 112, 107], "cie":[44.3279285779381, -14.9357527467259, -1.60294266080496], "hue":"BG", "saturation":"7", "brightness":"8", "alternatives":[{"colorCode":"C7", "score":5.14153513131534}, {"colorCode":"B97", "score":7.06551242369702}, {"colorCode":"C8", "score":7.32955573644918}, {"colorCode":"T8", "score":7.47574223549433}, {"colorCode":"W8", "score":7.47574223549433}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG90.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG90.json deleted file mode 100644 index 67ea42d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG90.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG90", "rgbString":"e8ede7", "name":"Sketch Gray Sky", "rgb":[232, 237, 231], "cie":[93.230157221255, -2.7281823700181, 2.30941162594644], "hue":"BG", "saturation":"9", "brightness":"0", "alternatives":[{"colorCode":"W1", "score":1.84581945937102}, {"colorCode":"W0", "score":1.93239387235354}, {"colorCode":"G00", "score":2.25537652341781}, {"colorCode":"B000", "score":2.27310597876077}, {"colorCode":"T1", "score":2.27605350607391}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG93.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG93.json deleted file mode 100644 index c784b83..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG93.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG93", "rgbString":"bac1b9", "name":"Green Gray", "rgb":[186, 193, 185], "cie":[77.3297331300059, -3.89937302858001, 3.17446925574814], "hue":"BG", "saturation":"9", "brightness":"3", "alternatives":[{"colorCode":"W4", "score":1.74356010148862}, {"colorCode":"T4", "score":3.48672076328655}, {"colorCode":"E44", "score":4.18003697754523}, {"colorCode":"C4", "score":5.06090460483972}, {"colorCode":"N4", "score":6.27275866851115}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG96.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG96.json deleted file mode 100644 index d51ec70..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG96.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG96", "rgbString":"81a291", "name":"Bush", "rgb":[129, 162, 145], "cie":[63.7966066152234, -14.9247448304016, 5.10372214327204], "hue":"BG", "saturation":"9", "brightness":"6", "alternatives":[{"colorCode":"G94", "score":3.36326506499809}, {"colorCode":"BG99", "score":4.39993419319526}, {"colorCode":"W6", "score":7.61430595803671}, {"colorCode":"BG75", "score":7.71198530368378}, {"colorCode":"BG72", "score":7.78050976955899}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BG99.json b/uml2es/examples/blockFactory/data/blockfactory/color/BG99.json deleted file mode 100644 index 420d51c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BG99.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BG99", "rgbString":"6e9b87", "name":"Flagstone Blue", "rgb":[110, 155, 135], "cie":[60.3440046314044, -19.6513995904137, 5.6106177693575], "hue":"BG", "saturation":"9", "brightness":"9", "alternatives":[{"colorCode":"BG96", "score":4.2215987691714}, {"colorCode":"C6", "score":7.02514737273277}, {"colorCode":"G46", "score":7.90176096983611}, {"colorCode":"C5", "score":8.11198646695965}, {"colorCode":"BG75", "score":8.49705225226738}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV00.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV00.json deleted file mode 100644 index a0ad515..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV00", "rgbString":"e0dced", "name":"Mauve Shadow", "rgb":[224, 220, 237], "cie":[88.5183087446126, 4.47960502827832, -7.81577960185433], "hue":"BV", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"V20", "score":1.93904622915419}, {"colorCode":"BV20", "score":2.61212566348462}, {"colorCode":"V000", "score":3.2938866865723}, {"colorCode":"B60", "score":3.48488241825242}, {"colorCode":"E71", "score":3.65355658918028}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV000.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV000.json deleted file mode 100644 index 2072aa4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV000", "rgbString":"eae7f2", "name":"Iridescent Mauve", "rgb":[234, 231, 242], "cie":[92.1561856616964, 2.99466601059728, -4.97592501422675], "hue":"BV", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"BV0000", "score":0}, {"colorCode":"BV31", "score":0}, {"colorCode":"V000", "score":1.38407788777527}, {"colorCode":"RV0000", "score":1.49795887945379}, {"colorCode":"C0", "score":1.72811856107344}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV0000.json deleted file mode 100644 index b5996f6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV0000", "rgbString":"eae7f2", "name":"Sketch Pale Thistle", "rgb":[234, 231, 242], "cie":[92.1561856616964, 2.99466601059728, -4.97592501422675], "hue":"BV", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"BV000", "score":0}, {"colorCode":"BV31", "score":0}, {"colorCode":"V000", "score":1.38407788777527}, {"colorCode":"RV0000", "score":1.49795887945379}, {"colorCode":"C0", "score":1.72811856107344}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV01.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV01.json deleted file mode 100644 index be58865..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV01", "rgbString":"c4c9e6", "name":"Viola", "rgb":[196, 201, 230], "cie":[81.4135914301174, 4.05247736990327, -14.9207276852875], "hue":"BV", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"BV23", "score":3.99892640162613}, {"colorCode":"BV11", "score":4.20250823604926}, {"colorCode":"B93", "score":6.02340954746039}, {"colorCode":"BV20", "score":6.04967064216296}, {"colorCode":"RV91", "score":6.25058329801161}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV02.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV02.json deleted file mode 100644 index 237733b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV02", "rgbString":"aab8db", "name":"Prune", "rgb":[170, 184, 219], "cie":[74.7880167900764, 2.66491736499558, -19.1677504074954], "hue":"BV", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"B63", "score":1.07827668532665}, {"colorCode":"V22", "score":2.07686302312109}, {"colorCode":"BV23", "score":3.13482481287266}, {"colorCode":"B23", "score":3.31074289570445}, {"colorCode":"B34", "score":5.27735544595465}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV04.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV04.json deleted file mode 100644 index 2696466..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV04.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV04", "rgbString":"7c97ce", "name":"Blue Berry", "rgb":[124, 151, 206], "cie":[62.4015766275596, 4.44794023882172, -31.2552280768527], "hue":"BV", "saturation":"0", "brightness":"4", "alternatives":[{"colorCode":"BV13", "score":3.17264572608189}, {"colorCode":"B95", "score":5.12007104061394}, {"colorCode":"B66", "score":5.9744500381892}, {"colorCode":"BV17", "score":6.8547029358722}, {"colorCode":"B06", "score":6.88186416356188}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV08.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV08.json deleted file mode 100644 index cd8ad49..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV08.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV08", "rgbString":"9d7eb9", "name":"Blue Violet", "rgb":[157, 126, 185], "cie":[57.6483015063567, 23.445380039247, -26.5462565540491], "hue":"BV", "saturation":"0", "brightness":"8", "alternatives":[{"colorCode":"V25", "score":4.15879389071368}, {"colorCode":"RV95", "score":5.08529413364055}, {"colorCode":"FV2", "score":5.52079057800528}, {"colorCode":"BV25", "score":6.1339600874864}, {"colorCode":"V17", "score":6.1668837833679}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV11.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV11.json deleted file mode 100644 index 1c5b5e5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV11.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV11", "rgbString":"d4d2e8", "name":"Soft Violet", "rgb":[212, 210, 232], "cie":[84.9537719770797, 4.83538696929914, -10.5673926106107], "hue":"BV", "saturation":"1", "brightness":"1", "alternatives":[{"colorCode":"BV00", "score":3.95586443314469}, {"colorCode":"BV01", "score":4.346362948359}, {"colorCode":"C2", "score":4.39847841261581}, {"colorCode":"BV20", "score":4.60790231860697}, {"colorCode":"B60", "score":4.7307202422329}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV13.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV13.json deleted file mode 100644 index 7516b0d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV13.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV13", "rgbString":"8491c8", "name":"Hydrangea Blue", "rgb":[132, 145, 200], "cie":[61.0686728830835, 8.49104560480357, -29.9165957660884], "hue":"BV", "saturation":"1", "brightness":"3", "alternatives":[{"colorCode":"BV04", "score":3.18531029156062}, {"colorCode":"B66", "score":4.7890179797045}, {"colorCode":"BV17", "score":5.5550225660772}, {"colorCode":"B95", "score":6.05387771210835}, {"colorCode":"V25", "score":6.10562839359739}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV17.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV17.json deleted file mode 100644 index 3decf5c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV17", "rgbString":"6e84bd", "name":"Deep Reddish Blue", "rgb":[110, 132, 189], "cie":[55.5751858372395, 6.9308109958659, -32.3423892527622], "hue":"BV", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"B66", "score":1.49576724539439}, {"colorCode":"FV2", "score":3.98288822791955}, {"colorCode":"BV25", "score":5.25265275884773}, {"colorCode":"BV13", "score":5.55072049594145}, {"colorCode":"V25", "score":5.99720463071175}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV20.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV20.json deleted file mode 100644 index 705cdf1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV20.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV20", "rgbString":"cfdbf1", "name":"Dull Lavender", "rgb":[207, 219, 241], "cie":[87.1336718680395, 0.315788107831783, -12.1172428980998], "hue":"BV", "saturation":"2", "brightness":"0", "alternatives":[{"colorCode":"BV00", "score":2.4442103822362}, {"colorCode":"B60", "score":2.86461869464997}, {"colorCode":"BG01", "score":2.94480327818915}, {"colorCode":"B91", "score":4.209952609872}, {"colorCode":"BG11", "score":4.22550341552565}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV23.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV23.json deleted file mode 100644 index fb261a1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV23", "rgbString":"b1c0dd", "name":"Grayish Lavender", "rgb":[177, 192, 221], "cie":[77.4401255058543, 0.954884596498451, -16.1971376085125], "hue":"BV", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"BV02", "score":3.20935724037191}, {"colorCode":"B63", "score":3.25927962033576}, {"colorCode":"B52", "score":3.58255980334416}, {"colorCode":"BV01", "score":3.99792766088621}, {"colorCode":"V22", "score":4.25987303616339}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV25.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV25.json deleted file mode 100644 index 8fc9c92..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV25.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV25", "rgbString":"8184a7", "name":"Grayish Violet", "rgb":[129, 132, 167], "cie":[56.0473981243404, 6.70277027934313, -18.905599203651], "hue":"BV", "saturation":"2", "brightness":"5", "alternatives":[{"colorCode":"V25", "score":3.52043043432777}, {"colorCode":"C6", "score":6.27415491229236}, {"colorCode":"BV17", "score":6.85837320781187}, {"colorCode":"B97", "score":7.44250253982571}, {"colorCode":"V95", "score":7.53457969948794}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV29.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV29.json deleted file mode 100644 index 9d0988a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV29.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV29", "rgbString":"384558", "name":"Slate", "rgb":[56, 69, 88], "cie":[28.9062391775379, 0.072926574449822, -12.9950166318758], "hue":"BV", "saturation":"2", "brightness":"9", "alternatives":[{"colorCode":"C9", "score":4.54023019564293}, {"colorCode":"W9", "score":7.16414371736348}, {"colorCode":"T9", "score":7.95330731278108}, {"colorCode":"N9", "score":8.29038800308054}, {"colorCode":"V99", "score":9.46438141143792}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV31.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV31.json deleted file mode 100644 index 9de51fa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV31.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV31", "rgbString":"eae7f2", "name":"Pale Lavender", "rgb":[234, 231, 242], "cie":[92.1561856616964, 2.99466601059728, -4.97592501422675], "hue":"BV", "saturation":"3", "brightness":"1", "alternatives":[{"colorCode":"BV0000", "score":0}, {"colorCode":"BV000", "score":0}, {"colorCode":"V000", "score":1.38407788777527}, {"colorCode":"RV0000", "score":1.49795887945379}, {"colorCode":"C0", "score":1.72811856107344}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/BV34.json b/uml2es/examples/blockFactory/data/blockfactory/color/BV34.json deleted file mode 100644 index de47673..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/BV34.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"BV34", "rgbString":"9fa7bc", "name":"Sketch Bluebell", "rgb":[159, 167, 188], "cie":[68.4891038658967, 1.54201314387753, -11.729561745631], "hue":"BV", "saturation":"3", "brightness":"4", "alternatives":[{"colorCode":"C5", "score":4.26064246531668}, {"colorCode":"C4", "score":5.14060684429587}, {"colorCode":"V22", "score":5.73710043823977}, {"colorCode":"N5", "score":6.31562021763953}, {"colorCode":"B95", "score":7.64554946444538}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C0.json b/uml2es/examples/blockFactory/data/blockfactory/color/C0.json deleted file mode 100644 index 0911991..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C0.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C0", "rgbString":"e0e7ed", "name":"Cool Gray", "rgb":[224, 231, 237], "cie":[91.285642458576, -1.21801911897013, -3.73080481243668], "hue":"C", "saturation":"0", "brightness":"-", "alternatives":[{"colorCode":"C1", "score":1.58355007031508}, {"colorCode":"BV31", "score":1.82179318248076}, {"colorCode":"BV000", "score":1.82179318248076}, {"colorCode":"BV0000", "score":1.82179318248076}, {"colorCode":"BG70", "score":2.20337294906619}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C00.json b/uml2es/examples/blockFactory/data/blockfactory/color/C00.json deleted file mode 100644 index b9070cc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C00", "rgbString":"e8f0f3", "name":"Cool Gray", "rgb":[232, 240, 243], "cie":[94.2897047869905, -2.09181130428182, -2.37655667017416], "hue":"C", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"B000", "score":1.75302552876024}, {"colorCode":"N0", "score":2.04063876310576}, {"colorCode":"T0", "score":2.04063876310576}, {"colorCode":"T1", "score":2.49493791649712}, {"colorCode":"G000", "score":2.52875630051532}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C1.json b/uml2es/examples/blockFactory/data/blockfactory/color/C1.json deleted file mode 100644 index 2507dac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C1", "rgbString":"dae3e8", "name":"Cool Gray No. 1", "rgb":[218, 227, 232], "cie":[89.7058043224532, -2.0658175274384, -3.48595701110455], "hue":"C", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"C0", "score":1.58351417422341}, {"colorCode":"B91", "score":2.08121252051762}, {"colorCode":"N1", "score":2.54677590957986}, {"colorCode":"T2", "score":2.62148677389176}, {"colorCode":"BV31", "score":2.86510264304606}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C10.json b/uml2es/examples/blockFactory/data/blockfactory/color/C10.json deleted file mode 100644 index fadd93f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C10.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C10", "rgbString":"202b31", "name":"Cool Gray", "rgb":[32, 43, 49], "cie":[16.7799511148678, -2.9348175037695, -5.42809713254174], "hue":"C", "saturation":"1", "brightness":"0", "alternatives":[{"colorCode":"100", "score":2.9022510195857}, {"colorCode":"W10", "score":3.72099631466897}, {"colorCode":"T10", "score":4.11069225297786}, {"colorCode":"N10", "score":4.84619302717603}, {"colorCode":"E79", "score":10.0772621175339}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C2.json b/uml2es/examples/blockFactory/data/blockfactory/color/C2.json deleted file mode 100644 index 63e4cbf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C2", "rgbString":"ccd7dd", "name":"Cool Gray", "rgb":[204, 215, 221], "cie":[85.3312995974538, -2.55105401898553, -4.2387241382581], "hue":"C", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"N3", "score":3.33969522836284}, {"colorCode":"N2", "score":3.75039094338961}, {"colorCode":"C3", "score":3.94304332327408}, {"colorCode":"B91", "score":4.03154817065113}, {"colorCode":"RV91", "score":4.20814565005185}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C3.json b/uml2es/examples/blockFactory/data/blockfactory/color/C3.json deleted file mode 100644 index 75f5a48..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C3.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C3", "rgbString":"c1ccd2", "name":"Cool Gray No. 3", "rgb":[193, 204, 210], "cie":[81.3884231371621, -2.5713747715736, -4.27825647712246], "hue":"C", "saturation":"3", "brightness":"-", "alternatives":[{"colorCode":"T3", "score":2.97845849351504}, {"colorCode":"C2", "score":3.94304277985216}, {"colorCode":"N3", "score":4.21597280140811}, {"colorCode":"W4", "score":5.2109393640399}, {"colorCode":"N4", "score":5.27304634114145}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C4.json b/uml2es/examples/blockFactory/data/blockfactory/color/C4.json deleted file mode 100644 index 7674019..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C4.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C4", "rgbString":"a6b4bd", "name":"Cool Gray", "rgb":[166, 180, 189], "cie":[72.5107468538059, -3.00803515710796, -6.23643247868742], "hue":"C", "saturation":"4", "brightness":"-", "alternatives":[{"colorCode":"W5", "score":4.71287941099965}, {"colorCode":"W4", "score":4.78166710235628}, {"colorCode":"N5", "score":4.83134744045258}, {"colorCode":"BG93", "score":5.03109692390722}, {"colorCode":"T5", "score":5.40820954841728}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C5.json b/uml2es/examples/blockFactory/data/blockfactory/color/C5.json deleted file mode 100644 index c2661b8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C5.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C5", "rgbString":"92a0ab", "name":"Cool Gray No. 5", "rgb":[146, 160, 171], "cie":[65.1153802452492, -2.61494455497907, -7.3943001121656], "hue":"C", "saturation":"5", "brightness":"-", "alternatives":[{"colorCode":"BV34", "score":4.47975519090459}, {"colorCode":"W6", "score":4.92317806431173}, {"colorCode":"T6", "score":5.18874779010846}, {"colorCode":"N6", "score":5.32598772615266}, {"colorCode":"T5", "score":5.34032890361147}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C6.json b/uml2es/examples/blockFactory/data/blockfactory/color/C6.json deleted file mode 100644 index 59c7093..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C6.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C6", "rgbString":"7b8c96", "name":"Cool Gray", "rgb":[123, 140, 150], "cie":[57.2398398107554, -3.87887917893359, -7.38168843201388], "hue":"C", "saturation":"6", "brightness":"-", "alternatives":[{"colorCode":"W6", "score":5.54826525577364}, {"colorCode":"T6", "score":5.83808220809225}, {"colorCode":"N6", "score":6.29345011920966}, {"colorCode":"C5", "score":7.88378465822356}, {"colorCode":"N7", "score":8.04756827409434}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C7.json b/uml2es/examples/blockFactory/data/blockfactory/color/C7.json deleted file mode 100644 index c0e9103..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C7.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C7", "rgbString":"637079", "name":"Cool Gray No. 7", "rgb":[99, 112, 121], "cie":[46.4738951839644, -2.79028147138372, -6.62749965343861], "hue":"C", "saturation":"7", "brightness":"-", "alternatives":[{"colorCode":"W7", "score":4.92390637312665}, {"colorCode":"W8", "score":5.34688585034531}, {"colorCode":"T8", "score":5.34688585034531}, {"colorCode":"N7", "score":5.40425905669597}, {"colorCode":"T7", "score":5.52130650813471}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C8.json b/uml2es/examples/blockFactory/data/blockfactory/color/C8.json deleted file mode 100644 index 4d3fbb6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C8.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C8", "rgbString":"535d66", "name":"Cool Gray", "rgb":[83, 93, 102], "cie":[38.945023224731, -1.73806058841508, -6.45431436423467], "hue":"C", "saturation":"8", "brightness":"-", "alternatives":[{"colorCode":"T8", "score":4.25264777194015}, {"colorCode":"W8", "score":4.25264777194015}, {"colorCode":"N8", "score":5.37488464146619}, {"colorCode":"W9", "score":6.97875392982608}, {"colorCode":"N9", "score":7.46312201283038}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/C9.json b/uml2es/examples/blockFactory/data/blockfactory/color/C9.json deleted file mode 100644 index ea601ff..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/C9.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"C9", "rgbString":"3c474d", "name":"Cool Gray", "rgb":[60, 71, 77], "cie":[29.4199240027646, -2.89464090549541, -5.07920615640338], "hue":"C", "saturation":"9", "brightness":"-", "alternatives":[{"colorCode":"W9", "score":3.73987692913588}, {"colorCode":"T9", "score":4.3622427612627}, {"colorCode":"N9", "score":4.86596617635503}, {"colorCode":"BV29", "score":5.68332324332638}, {"colorCode":"RV99", "score":6.43873998432193}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E00.json b/uml2es/examples/blockFactory/data/blockfactory/color/E00.json deleted file mode 100644 index bcf063c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E00", "rgbString":"fdf3ea", "name":"Skin White", "rgb":[253, 243, 234], "cie":[96.3788839369155, 1.84083711268557, 5.5154608260054], "hue":"E", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"E000", "score":1.05253258694386}, {"colorCode":"R000", "score":1.08590564816339}, {"colorCode":"R0000", "score":1.12744198618939}, {"colorCode":"W00", "score":1.55629425669948}, {"colorCode":"YR0000", "score":2.01074614344426}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E000.json b/uml2es/examples/blockFactory/data/blockfactory/color/E000.json deleted file mode 100644 index c2ff1d8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E000", "rgbString":"fef5ee", "name":"Pale Fruit Pink", "rgb":[254, 245, 238], "cie":[97.0441481457387, 1.82722158958704, 4.42293581757554], "hue":"E", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"E00", "score":1.07679375888714}, {"colorCode":"W00", "score":1.51400507787833}, {"colorCode":"R0000", "score":1.62870880169034}, {"colorCode":"E0000", "score":1.79370701517469}, {"colorCode":"R000", "score":2.18468463695292}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/E0000.json deleted file mode 100644 index 95c9036..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E0000", "rgbString":"fffaf4", "name":"Floral White", "rgb":[255, 250, 244], "cie":[98.4969166701705, 0.637802171880197, 3.44839312039991], "hue":"E", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"Y0000", "score":1.62597401083177}, {"colorCode":"E000", "score":1.82486436585732}, {"colorCode":"R0000", "score":2.07442517746727}, {"colorCode":"W00", "score":2.89527886683581}, {"colorCode":"E00", "score":2.90837524231384}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E01.json b/uml2es/examples/blockFactory/data/blockfactory/color/E01.json deleted file mode 100644 index 39fe648..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E01", "rgbString":"ffeee4", "name":"Pink Flamingo", "rgb":[255, 238, 228], "cie":[95.165364944495, 4.10194155966415, 6.88822720315931], "hue":"E", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"E02", "score":0.98317597479635}, {"colorCode":"R000", "score":0.998517207198061}, {"colorCode":"E41", "score":1.2003025978563}, {"colorCode":"R00", "score":1.21936275954185}, {"colorCode":"E00", "score":2.02298654100919}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E02.json b/uml2es/examples/blockFactory/data/blockfactory/color/E02.json deleted file mode 100644 index bf3e218..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E02", "rgbString":"feece0", "name":"Fruit Pink", "rgb":[254, 236, 224], "cie":[94.5016749685194, 4.13983422315611, 7.99600948064967], "hue":"E", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"E01", "score":0.96638396018556}, {"colorCode":"E41", "score":1.2908386387025}, {"colorCode":"R00", "score":1.53788716629013}, {"colorCode":"R000", "score":1.92689102667479}, {"colorCode":"YR0000", "score":1.9714986465918}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E04.json b/uml2es/examples/blockFactory/data/blockfactory/color/E04.json deleted file mode 100644 index ebbcecb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E04.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E04", "rgbString":"e4bcc4", "name":"Lipstick Natural", "rgb":[228, 188, 196], "cie":[79.8669472366936, 15.5600014333148, 1.355410404054], "hue":"E", "saturation":"0", "brightness":"4", "alternatives":[{"colorCode":"V91", "score":2.66513887738875}, {"colorCode":"V93", "score":2.75397208866623}, {"colorCode":"RV93", "score":3.61350068676932}, {"colorCode":"R81", "score":4.59682151519589}, {"colorCode":"R32", "score":5.06442686702266}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E07.json b/uml2es/examples/blockFactory/data/blockfactory/color/E07.json deleted file mode 100644 index 3cf0707..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E07.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E07", "rgbString":"cc816a", "name":"Light Mahogany", "rgb":[204, 129, 106], "cie":[61.2888167465173, 26.4437499288306, 24.5548103068242], "hue":"E", "saturation":"0", "brightness":"7", "alternatives":[{"colorCode":"E37", "score":4.09822919603332}, {"colorCode":"R43", "score":6.36002304170331}, {"colorCode":"R35", "score":6.88537507503254}, {"colorCode":"R24", "score":6.91852085994115}, {"colorCode":"E39", "score":7.0078473013397}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E08.json b/uml2es/examples/blockFactory/data/blockfactory/color/E08.json deleted file mode 100644 index 5f570d5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E08.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E08", "rgbString":"ca6553", "name":"Brown", "rgb":[202, 101, 83], "cie":[54.5414693261313, 38.524926766051, 28.7213314747456], "hue":"E", "saturation":"0", "brightness":"8", "alternatives":[{"colorCode":"E09", "score":3.73311833490511}, {"colorCode":"YR27", "score":4.35822690736311}, {"colorCode":"E17", "score":4.41297523358462}, {"colorCode":"E19", "score":5.87699004292705}, {"colorCode":"E57", "score":6.45943440053561}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E09.json b/uml2es/examples/blockFactory/data/blockfactory/color/E09.json deleted file mode 100644 index 805f7df..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E09.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E09", "rgbString":"d96a4f", "name":"Burnt Sienna", "rgb":[217, 106, 79], "cie":[57.6787017443207, 41.4170066706546, 35.3497132517559], "hue":"E", "saturation":"0", "brightness":"9", "alternatives":[{"colorCode":"YR27", "score":2.52266076782929}, {"colorCode":"E08", "score":3.64436348763107}, {"colorCode":"R08", "score":4.36036847668437}, {"colorCode":"YR18", "score":5.97899050599786}, {"colorCode":"E57", "score":6.39656173059058}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E11.json b/uml2es/examples/blockFactory/data/blockfactory/color/E11.json deleted file mode 100644 index ac0a3cb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E11.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E11", "rgbString":"fee9d6", "name":"Barley Beige", "rgb":[254, 233, 214], "cie":[93.5389001210454, 4.12584760269119, 11.8063899081357], "hue":"E", "saturation":"1", "brightness":"1", "alternatives":[{"colorCode":"YR000", "score":0.801434605531488}, {"colorCode":"E51", "score":0.834298178231731}, {"colorCode":"E31", "score":1.93108801613737}, {"colorCode":"E42", "score":2.11102223717382}, {"colorCode":"YR30", "score":2.33037162761081}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E13.json b/uml2es/examples/blockFactory/data/blockfactory/color/E13.json deleted file mode 100644 index d8f1cb2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E13.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E13", "rgbString":"e9c5af", "name":"Light Suntan", "rgb":[233, 197, 175], "cie":[82.028758847996, 9.47559540189807, 15.7764143907845], "hue":"E", "saturation":"1", "brightness":"3", "alternatives":[{"colorCode":"E23", "score":1.56085129212393}, {"colorCode":"E35", "score":2.271937360247}, {"colorCode":"E34", "score":3.70578363463632}, {"colorCode":"R22", "score":4.46980396537741}, {"colorCode":"E33", "score":4.51069129490856}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E15.json b/uml2es/examples/blockFactory/data/blockfactory/color/E15.json deleted file mode 100644 index 77330a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E15.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E15", "rgbString":"fbbb8d", "name":"Dark Suntan", "rgb":[251, 187, 141], "cie":[80.7237575785245, 17.5606489182625, 32.2834368495981], "hue":"E", "saturation":"1", "brightness":"5", "alternatives":[{"colorCode":"YR15", "score":1.56924270709008}, {"colorCode":"E95", "score":2.4651144918906}, {"colorCode":"YR82", "score":2.86973386302404}, {"colorCode":"FYR1", "score":4.67355359175301}, {"colorCode":"E35", "score":5.52074802371203}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E17.json b/uml2es/examples/blockFactory/data/blockfactory/color/E17.json deleted file mode 100644 index 2f42b3b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E17", "rgbString":"b85f57", "name":"Reddish Brass", "rgb":[184, 95, 87], "cie":[50.7606973914578, 35.0547285194608, 20.9840334568159], "hue":"E", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"E08", "score":4.55235777234974}, {"colorCode":"E19", "score":6.13449746363363}, {"colorCode":"E39", "score":6.88135448241036}, {"colorCode":"E27", "score":7.84869601403182}, {"colorCode":"R46", "score":7.9197723051144}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E18.json b/uml2es/examples/blockFactory/data/blockfactory/color/E18.json deleted file mode 100644 index c0a8a74..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E18.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E18", "rgbString":"88534d", "name":"Copper", "rgb":[136, 83, 77], "cie":[41.1470201016278, 21.3699156403503, 12.8507803441695], "hue":"E", "saturation":"1", "brightness":"8", "alternatives":[{"colorCode":"E77", "score":3.92092857763556}, {"colorCode":"E29", "score":5.76161909999131}, {"colorCode":"E47", "score":8.18728113511163}, {"colorCode":"E49", "score":8.28191640663831}, {"colorCode":"C8", "score":8.87819621882249}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E19.json b/uml2es/examples/blockFactory/data/blockfactory/color/E19.json deleted file mode 100644 index 751ae6b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E19.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E19", "rgbString":"c45238", "name":"Redwood", "rgb":[196, 82, 56], "cie":[49.5638053005952, 44.0235231154042, 37.6592347696395], "hue":"E", "saturation":"1", "brightness":"9", "alternatives":[{"colorCode":"E17", "score":4.88363670035785}, {"colorCode":"E08", "score":5.68161150629161}, {"colorCode":"E99", "score":6.34918581555853}, {"colorCode":"YR27", "score":6.51453209719181}, {"colorCode":"R29", "score":6.55091231557181}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E21.json b/uml2es/examples/blockFactory/data/blockfactory/color/E21.json deleted file mode 100644 index 1fbbfd1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E21", "rgbString":"fde2c7", "name":"Baby Skin Pink", "rgb":[253, 226, 199], "cie":[91.414468123465, 5.1510168622575, 16.5824565627273], "hue":"E", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"Y32", "score":1.65714098716265}, {"colorCode":"YR01", "score":2.10956059163753}, {"colorCode":"YR20", "score":2.11323365983933}, {"colorCode":"E31", "score":2.37781798533651}, {"colorCode":"YR02", "score":2.68484684091297}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E23.json b/uml2es/examples/blockFactory/data/blockfactory/color/E23.json deleted file mode 100644 index 221f37a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E23", "rgbString":"eccab1", "name":"Hazelnut", "rgb":[236, 202, 177], "cie":[83.5728252965052, 8.24802981151679, 16.9170745896247], "hue":"E", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"E13", "score":1.56051346333853}, {"colorCode":"E33", "score":3.02216237862158}, {"colorCode":"E34", "score":3.04372872480569}, {"colorCode":"E35", "score":3.1201906611322}, {"colorCode":"RV42", "score":3.66016892601957}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E25.json b/uml2es/examples/blockFactory/data/blockfactory/color/E25.json deleted file mode 100644 index 6455b05..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E25.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E25", "rgbString":"d2a482", "name":"Caribe Cocoa", "rgb":[210, 164, 130], "cie":[70.7772344433825, 12.4068236597559, 24.1411453365614], "hue":"E", "saturation":"2", "brightness":"5", "alternatives":[{"colorCode":"R14", "score":5.166264469424}, {"colorCode":"E84", "score":6.22974675731412}, {"colorCode":"R43", "score":8.24612226027295}, {"colorCode":"BG96", "score":8.65585725045139}, {"colorCode":"E37", "score":8.8235437636061}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E27.json b/uml2es/examples/blockFactory/data/blockfactory/color/E27.json deleted file mode 100644 index 2ad8c5b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E27.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E27", "rgbString":"997663", "name":"Africano", "rgb":[153, 118, 99], "cie":[52.5421777216719, 10.9368003311431, 15.7299306530154], "hue":"E", "saturation":"2", "brightness":"7", "alternatives":[{"colorCode":"E59", "score":3.14483202157439}, {"colorCode":"E47", "score":4.00528311948196}, {"colorCode":"E74", "score":6.05238428615622}, {"colorCode":"C6", "score":7.47183459083368}, {"colorCode":"C7", "score":8.83897423529436}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E29.json b/uml2es/examples/blockFactory/data/blockfactory/color/E29.json deleted file mode 100644 index 3c3a107..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E29.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E29", "rgbString":"884636", "name":"Burnt Umber", "rgb":[136, 70, 54], "cie":[37.6278214598009, 26.522683654185, 22.2464764051435], "hue":"E", "saturation":"2", "brightness":"9", "alternatives":[{"colorCode":"E18", "score":5.16823401473715}, {"colorCode":"RV69", "score":6.83664865566353}, {"colorCode":"E49", "score":8.33494417292155}, {"colorCode":"E77", "score":8.65394367876466}, {"colorCode":"E87", "score":9.22504492354652}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E30.json b/uml2es/examples/blockFactory/data/blockfactory/color/E30.json deleted file mode 100644 index e33174b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E30.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E30", "rgbString":"f7f0d6", "name":"Bisque", "rgb":[247, 240, 214], "cie":[94.716786924219, -1.9080558351775, 13.4038981995596], "hue":"E", "saturation":"3", "brightness":"0", "alternatives":[{"colorCode":"YR30", "score":1.17441447811435}, {"colorCode":"YG0000", "score":1.90789821386989}, {"colorCode":"YG11", "score":2.56316781899155}, {"colorCode":"E41", "score":2.75050310069642}, {"colorCode":"E31", "score":3.07418790454794}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E31.json b/uml2es/examples/blockFactory/data/blockfactory/color/E31.json deleted file mode 100644 index a5d07ff..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E31.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E31", "rgbString":"f2e6ce", "name":"Brick Beige", "rgb":[242, 230, 206], "cie":[91.6521442187905, 0.177118936240506, 13.1482832773609], "hue":"E", "saturation":"3", "brightness":"1", "alternatives":[{"colorCode":"E11", "score":1.9295087283511}, {"colorCode":"E21", "score":2.65845723827359}, {"colorCode":"YR000", "score":2.73023233632699}, {"colorCode":"E42", "score":2.74157354241894}, {"colorCode":"YG11", "score":2.85475241609059}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E33.json b/uml2es/examples/blockFactory/data/blockfactory/color/E33.json deleted file mode 100644 index cfa0e9a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E33.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E33", "rgbString":"f3d2b1", "name":"Sand", "rgb":[243, 210, 177], "cie":[86.167303841264, 6.69357514705388, 20.6241849087605], "hue":"E", "saturation":"3", "brightness":"3", "alternatives":[{"colorCode":"R12", "score":2.14463847299819}, {"colorCode":"YR00", "score":2.30324035500803}, {"colorCode":"R02", "score":2.76243675899973}, {"colorCode":"E34", "score":2.82052665748179}, {"colorCode":"E23", "score":2.97160691192136}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E34.json b/uml2es/examples/blockFactory/data/blockfactory/color/E34.json deleted file mode 100644 index 03f2872..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E34.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E34", "rgbString":"f0caa6", "name":"Orientale", "rgb":[240, 202, 166], "cie":[83.7149652420831, 8.29924766275736, 22.983575224154], "hue":"E", "saturation":"3", "brightness":"4", "alternatives":[{"colorCode":"E23", "score":2.67826328539451}, {"colorCode":"E33", "score":2.78083420348403}, {"colorCode":"E35", "score":2.91695585713893}, {"colorCode":"E13", "score":3.33150360622099}, {"colorCode":"E93", "score":3.83492594802142}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E35.json b/uml2es/examples/blockFactory/data/blockfactory/color/E35.json deleted file mode 100644 index 91dd86f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E35.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E35", "rgbString":"e6c3a3", "name":"Chamois", "rgb":[230, 195, 163], "cie":[81.0146270623392, 7.77396311585527, 20.7089467232611], "hue":"E", "saturation":"3", "brightness":"5", "alternatives":[{"colorCode":"E13", "score":2.12081477012963}, {"colorCode":"E34", "score":2.93922826461832}, {"colorCode":"E23", "score":3.04604068248409}, {"colorCode":"E33", "score":5.15732494812669}, {"colorCode":"E93", "score":6.31164120865112}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E37.json b/uml2es/examples/blockFactory/data/blockfactory/color/E37.json deleted file mode 100644 index 3b23262..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E37.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E37", "rgbString":"cc9159", "name":"Sepia", "rgb":[204, 145, 89], "cie":[64.811027922268, 16.2005412664392, 38.2978909310908], "hue":"E", "saturation":"3", "brightness":"7", "alternatives":[{"colorCode":"E07", "score":4.00895116965755}, {"colorCode":"Y28", "score":5.95948781807102}, {"colorCode":"E57", "score":6.74340427327993}, {"colorCode":"E97", "score":7.24102348463101}, {"colorCode":"E25", "score":7.80326255010545}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E39.json b/uml2es/examples/blockFactory/data/blockfactory/color/E39.json deleted file mode 100644 index 8ec145d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E39.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E39", "rgbString":"c5743f", "name":"Leather", "rgb":[197, 116, 63], "cie":[56.8015618536573, 27.2689881103066, 42.1597053532139], "hue":"E", "saturation":"3", "brightness":"9", "alternatives":[{"colorCode":"YR27", "score":3.40559832548088}, {"colorCode":"E57", "score":5.72744019804699}, {"colorCode":"R08", "score":6.00897829424032}, {"colorCode":"E07", "score":6.23794416221531}, {"colorCode":"E17", "score":6.68796088631975}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E40.json b/uml2es/examples/blockFactory/data/blockfactory/color/E40.json deleted file mode 100644 index 95d1f74..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E40.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E40", "rgbString":"f2e8dc", "name":"Brick White", "rgb":[242, 232, 220], "cie":[92.4678460061767, 1.36878769562682, 7.0259835903812], "hue":"E", "saturation":"4", "brightness":"0", "alternatives":[{"colorCode":"E42", "score":1.71733578701135}, {"colorCode":"R00", "score":1.92621583146724}, {"colorCode":"W0", "score":2.42181888719516}, {"colorCode":"E02", "score":2.46700125833362}, {"colorCode":"W1", "score":2.51291174648901}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E41.json b/uml2es/examples/blockFactory/data/blockfactory/color/E41.json deleted file mode 100644 index 5926fc7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E41.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E41", "rgbString":"fef1e1", "name":"Pearl White", "rgb":[254, 241, 225], "cie":[95.7546924572446, 1.75092456318476, 9.27619114324081], "hue":"E", "saturation":"4", "brightness":"1", "alternatives":[{"colorCode":"YR0000", "score":1.01176296745547}, {"colorCode":"E01", "score":1.15959361117045}, {"colorCode":"E02", "score":1.28981926504833}, {"colorCode":"R00", "score":1.8093515766268}, {"colorCode":"R000", "score":1.83693290307083}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E42.json b/uml2es/examples/blockFactory/data/blockfactory/color/E42.json deleted file mode 100644 index 2da9685..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E42.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E42", "rgbString":"f3ead9", "name":"Sand White", "rgb":[243, 234, 217], "cie":[92.9750549427314, 0.21013883238552, 9.32493218908876], "hue":"E", "saturation":"4", "brightness":"2", "alternatives":[{"colorCode":"E40", "score":1.60990293608666}, {"colorCode":"E11", "score":2.30922264117896}, {"colorCode":"E01", "score":2.3767915408669}, {"colorCode":"YR000", "score":2.44837187851835}, {"colorCode":"R11", "score":2.48725920100064}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E43.json b/uml2es/examples/blockFactory/data/blockfactory/color/E43.json deleted file mode 100644 index 96008fc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E43.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E43", "rgbString":"e8dabd", "name":"Dull Ivory", "rgb":[232, 218, 189], "cie":[87.4717602453832, 0.171761093359923, 16.0096687655159], "hue":"E", "saturation":"4", "brightness":"3", "alternatives":[{"colorCode":"YR01", "score":2.518470566957}, {"colorCode":"Y32", "score":2.93777465612597}, {"colorCode":"E55", "score":3.41523380956053}, {"colorCode":"E33", "score":3.54578036100589}, {"colorCode":"YG61", "score":3.82109034660525}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E44.json b/uml2es/examples/blockFactory/data/blockfactory/color/E44.json deleted file mode 100644 index 6a506ba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E44.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E44", "rgbString":"c5b9a9", "name":"Clay", "rgb":[197, 185, 169], "cie":[75.719799778641, 1.54206766237236, 9.63595416574601], "hue":"E", "saturation":"4", "brightness":"4", "alternatives":[{"colorCode":"BG93", "score":3.6600702979589}, {"colorCode":"W4", "score":4.57965772261809}, {"colorCode":"N4", "score":5.34476799906702}, {"colorCode":"E04", "score":5.81215504687636}, {"colorCode":"T4", "score":6.0019645463321}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E47.json b/uml2es/examples/blockFactory/data/blockfactory/color/E47.json deleted file mode 100644 index 33336a4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E47.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E47", "rgbString":"8a6e59", "name":"Dark Brown", "rgb":[138, 110, 89], "cie":[48.6064331572918, 7.91127938087621, 15.9169569404306], "hue":"E", "saturation":"4", "brightness":"7", "alternatives":[{"colorCode":"E27", "score":4.01013253563407}, {"colorCode":"E77", "score":5.20919927078335}, {"colorCode":"E59", "score":6.67023664041887}, {"colorCode":"E87", "score":7.36101049524083}, {"colorCode":"W7", "score":8.39527027671905}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E49.json b/uml2es/examples/blockFactory/data/blockfactory/color/E49.json deleted file mode 100644 index 1e74693..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E49.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E49", "rgbString":"634c3c", "name":"Dark Bark", "rgb":[99, 76, 60], "cie":[34.2887703086712, 7.23328739626281, 13.2363878668853], "hue":"E", "saturation":"4", "brightness":"9", "alternatives":[{"colorCode":"E89", "score":2.28117181239051}, {"colorCode":"C8", "score":6.83483097335464}, {"colorCode":"W9", "score":7.31118189271137}, {"colorCode":"C9", "score":7.34744151440993}, {"colorCode":"E87", "score":7.43902181499191}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E50.json b/uml2es/examples/blockFactory/data/blockfactory/color/E50.json deleted file mode 100644 index b5f4cb8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E50.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E50", "rgbString":"f4ebf0", "name":"Egg Shell", "rgb":[244, 235, 240], "cie":[93.8576980890782, 3.89915450713846, -1.3460875471486], "hue":"E", "saturation":"5", "brightness":"0", "alternatives":[{"colorCode":"RV0000", "score":1.90901653046761}, {"colorCode":"BV000", "score":2.21566862566939}, {"colorCode":"BV31", "score":2.21566862566939}, {"colorCode":"BV0000", "score":2.21566862566939}, {"colorCode":"V0000", "score":2.77759774591363}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E51.json b/uml2es/examples/blockFactory/data/blockfactory/color/E51.json deleted file mode 100644 index c3e68c0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E51.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E51", "rgbString":"feecd6", "name":"Milky White", "rgb":[254, 236, 214], "cie":[94.2767552350168, 2.59502903134878, 12.8557730262713], "hue":"E", "saturation":"5", "brightness":"1", "alternatives":[{"colorCode":"YR000", "score":0.557556821875162}, {"colorCode":"E11", "score":0.83118968277386}, {"colorCode":"YR30", "score":2.5752868197214}, {"colorCode":"E02", "score":2.5949720421109}, {"colorCode":"E42", "score":2.71445156404102}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E53.json b/uml2es/examples/blockFactory/data/blockfactory/color/E53.json deleted file mode 100644 index d0cabf2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E53.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E53", "rgbString":"f3e6c3", "name":"Raw Silk", "rgb":[243, 230, 195], "cie":[91.499884370501, -1.09933341090035, 18.6584029081617], "hue":"E", "saturation":"5", "brightness":"3", "alternatives":[{"colorCode":"E81", "score":0.992750160074733}, {"colorCode":"E55", "score":2.42790838953674}, {"colorCode":"E31", "score":3.01364290250471}, {"colorCode":"Y21", "score":3.90864957470797}, {"colorCode":"E11", "score":3.92944606962462}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E55.json b/uml2es/examples/blockFactory/data/blockfactory/color/E55.json deleted file mode 100644 index 42a7ed9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E55.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E55", "rgbString":"f1dfb9", "name":"Light Camel", "rgb":[241, 223, 185], "cie":[89.3831132911445, 0.329203797289734, 20.8774454056193], "hue":"E", "saturation":"5", "brightness":"5", "alternatives":[{"colorCode":"YR21", "score":1.9984045239487}, {"colorCode":"E81", "score":2.11381547179353}, {"colorCode":"E53", "score":2.3989046386644}, {"colorCode":"E21", "score":2.72257052974421}, {"colorCode":"E43", "score":3.15532698984742}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E57.json b/uml2es/examples/blockFactory/data/blockfactory/color/E57.json deleted file mode 100644 index 14a2ebe..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E57.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E57", "rgbString":"b18558", "name":"Light Walnut", "rgb":[177, 133, 88], "cie":[58.8136210463058, 11.3271879293882, 30.7090810249485], "hue":"E", "saturation":"5", "brightness":"7", "alternatives":[{"colorCode":"E37", "score":6.98442002864381}, {"colorCode":"E39", "score":7.34874285973292}, {"colorCode":"E08", "score":7.52580381825882}, {"colorCode":"E59", "score":7.64897480877004}, {"colorCode":"E74", "score":8.09257105949141}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E59.json b/uml2es/examples/blockFactory/data/blockfactory/color/E59.json deleted file mode 100644 index 8ae027b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E59.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E59", "rgbString":"9a7f6c", "name":"Walnut", "rgb":[154, 127, 108], "cie":[55.2075074714152, 7.43517605804706, 14.2242536608935], "hue":"E", "saturation":"5", "brightness":"9", "alternatives":[{"colorCode":"E74", "score":2.98896864271064}, {"colorCode":"E27", "score":3.21882665844195}, {"colorCode":"E47", "score":6.67657321181184}, {"colorCode":"RV95", "score":7.66021196629814}, {"colorCode":"W7", "score":9.10687428436374}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E70.json b/uml2es/examples/blockFactory/data/blockfactory/color/E70.json deleted file mode 100644 index 922ee78..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E70.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E70", "rgbString":"efeae6", "name":"Ash Rose", "rgb":[239, 234, 230], "cie":[92.9748152516228, 0.990022740160468, 2.52296625075903], "hue":"E", "saturation":"7", "brightness":"0", "alternatives":[{"colorCode":"W0", "score":1.2643707911833}, {"colorCode":"T1", "score":1.54140312931599}, {"colorCode":"N0", "score":1.89362751396904}, {"colorCode":"T0", "score":1.89362751396904}, {"colorCode":"W1", "score":1.98067222113445}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E71.json b/uml2es/examples/blockFactory/data/blockfactory/color/E71.json deleted file mode 100644 index a213277..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E71.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E71", "rgbString":"e2d7d3", "name":"Champagne", "rgb":[226, 215, 211], "cie":[86.7376298718575, 3.08695372922019, 3.30852017043188], "hue":"E", "saturation":"7", "brightness":"1", "alternatives":[{"colorCode":"N2", "score":2.9109321653447}, {"colorCode":"T3", "score":2.98708011853314}, {"colorCode":"V20", "score":3.49699029972423}, {"colorCode":"T2", "score":3.76060168114996}, {"colorCode":"N3", "score":3.81935177348755}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E74.json b/uml2es/examples/blockFactory/data/blockfactory/color/E74.json deleted file mode 100644 index 104c8b4..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E74.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E74", "rgbString":"a1847c", "name":"Cocoa Brown", "rgb":[161, 132, 124], "cie":[57.5928555268099, 9.7900481994404, 8.47422544484522], "hue":"E", "saturation":"7", "brightness":"4", "alternatives":[{"colorCode":"E59", "score":3.08729883642797}, {"colorCode":"E27", "score":6.39576382487626}, {"colorCode":"W6", "score":7.17425648575834}, {"colorCode":"T6", "score":7.48623267539342}, {"colorCode":"N6", "score":7.91154764967511}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E77.json b/uml2es/examples/blockFactory/data/blockfactory/color/E77.json deleted file mode 100644 index 073402a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E77.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E77", "rgbString":"7f604e", "name":"Maroon", "rgb":[127, 96, 78], "cie":[43.4009279860159, 9.95720479991769, 15.1481570183942], "hue":"E", "saturation":"7", "brightness":"7", "alternatives":[{"colorCode":"E87", "score":3.13508814743151}, {"colorCode":"E18", "score":4.37499729530962}, {"colorCode":"E47", "score":5.20913493435011}, {"colorCode":"C7", "score":6.76188333469212}, {"colorCode":"C8", "score":7.71845361776705}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E79.json b/uml2es/examples/blockFactory/data/blockfactory/color/E79.json deleted file mode 100644 index dd0e2d9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E79.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E79", "rgbString":"4a2c22", "name":"Cashew", "rgb":[74, 44, 34], "cie":[21.4786584018241, 12.5665765774334, 12.2665262270801], "hue":"E", "saturation":"7", "brightness":"9", "alternatives":[{"colorCode":"C10", "score":7.9093660006534}, {"colorCode":"W10", "score":8.53002944451434}, {"colorCode":"100", "score":8.82726755580772}, {"colorCode":"T10", "score":8.93801715036369}, {"colorCode":"N10", "score":9.33990767526515}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E81.json b/uml2es/examples/blockFactory/data/blockfactory/color/E81.json deleted file mode 100644 index e30caaf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E81.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E81", "rgbString":"f0e6c2", "name":"Ivory", "rgb":[240, 230, 194], "cie":[91.2405963847195, -2.33172385109726, 18.7788785857971], "hue":"E", "saturation":"8", "brightness":"1", "alternatives":[{"colorCode":"E53", "score":0.990192525143147}, {"colorCode":"E55", "score":2.13713646995894}, {"colorCode":"E31", "score":3.14531736679539}, {"colorCode":"YR21", "score":3.80712056987144}, {"colorCode":"Y21", "score":4.02116172078906}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E84.json b/uml2es/examples/blockFactory/data/blockfactory/color/E84.json deleted file mode 100644 index 6e3f714..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E84.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E84", "rgbString":"ae9f80", "name":"- Sketch Khaki", "rgb":[174, 159, 128], "cie":[66.0229315851997, 0.516820343821112, 18.192529470002], "hue":"E", "saturation":"8", "brightness":"4", "alternatives":[{"colorCode":"E25", "score":6.83913730828499}, {"colorCode":"E74", "score":8.91075125240239}, {"colorCode":"C4", "score":8.97323997734015}, {"colorCode":"W5", "score":9.00295267062698}, {"colorCode":"T5", "score":9.12018569080959}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E87.json b/uml2es/examples/blockFactory/data/blockfactory/color/E87.json deleted file mode 100644 index 21538d2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E87.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E87", "rgbString":"6f604d", "name":"Fig", "rgb":[111, 96, 77], "cie":[41.6593942520662, 2.84299795482595, 13.0890415695777], "hue":"E", "saturation":"8", "brightness":"7", "alternatives":[{"colorCode":"E77", "score":3.42857777892709}, {"colorCode":"C7", "score":6.17735619271919}, {"colorCode":"T8", "score":6.47905098257307}, {"colorCode":"W8", "score":6.47905098257307}, {"colorCode":"E49", "score":7.44563170658435}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E89.json b/uml2es/examples/blockFactory/data/blockfactory/color/E89.json deleted file mode 100644 index b8086af..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E89.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E89", "rgbString":"5a4939", "name":"- Sketch Pecan", "rgb":[90, 73, 57], "cie":[32.3341302182053, 4.56215924727371, 12.2900660264424], "hue":"E", "saturation":"8", "brightness":"9", "alternatives":[{"colorCode":"E49", "score":2.31573804617328}, {"colorCode":"C9", "score":5.41872166905501}, {"colorCode":"W9", "score":6.24764015896071}, {"colorCode":"N9", "score":7.41924057054254}, {"colorCode":"T9", "score":7.41993024013426}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E93.json b/uml2es/examples/blockFactory/data/blockfactory/color/E93.json deleted file mode 100644 index a112b7d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E93.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E93", "rgbString":"fed2b9", "name":"Tea Rose", "rgb":[254, 210, 185], "cie":[87.3228708044377, 11.859480261184, 18.1807450283577], "hue":"E", "saturation":"9", "brightness":"3", "alternatives":[{"colorCode":"YR00", "score":1.25069157809874}, {"colorCode":"R12", "score":1.66590135465531}, {"colorCode":"R02", "score":2.30294106854766}, {"colorCode":"YR01", "score":2.60842673416747}, {"colorCode":"YR61", "score":2.9069270713339}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E95.json b/uml2es/examples/blockFactory/data/blockfactory/color/E95.json deleted file mode 100644 index 449edc5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E95.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E95", "rgbString":"fcbc7e", "name":"Flesh Pink", "rgb":[252, 188, 126], "cie":[80.8322392546259, 16.0041646854986, 40.2186834255772], "hue":"E", "saturation":"9", "brightness":"5", "alternatives":[{"colorCode":"YR15", "score":1.4077753040448}, {"colorCode":"E15", "score":2.21968171272605}, {"colorCode":"YR82", "score":3.22263365957579}, {"colorCode":"YR23", "score":3.83898115361035}, {"colorCode":"YR04", "score":3.94009606683976}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E97.json b/uml2es/examples/blockFactory/data/blockfactory/color/E97.json deleted file mode 100644 index ed6c35d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E97.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E97", "rgbString":"ed9c5d", "name":"Deep Orange", "rgb":[237, 156, 93], "cie":[71.2633536583027, 24.2076995695674, 44.9106006501169], "hue":"E", "saturation":"9", "brightness":"7", "alternatives":[{"colorCode":"YR65", "score":5.77168148362919}, {"colorCode":"E37", "score":7.05896038390559}, {"colorCode":"E25", "score":7.26071744939816}, {"colorCode":"YR15", "score":9.20866293234275}, {"colorCode":"YG63", "score":9.66192467221578}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/E99.json b/uml2es/examples/blockFactory/data/blockfactory/color/E99.json deleted file mode 100644 index fdef0ed..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/E99.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"E99", "rgbString":"b46034", "name":"Baked Clay", "rgb":[180, 96, 52], "cie":[49.8783274982392, 30.4169715167661, 39.4765337638291], "hue":"E", "saturation":"9", "brightness":"9", "alternatives":[{"colorCode":"E19", "score":6.82409073481063}, {"colorCode":"E39", "score":6.92419672488092}, {"colorCode":"YR27", "score":7.04507219217679}, {"colorCode":"E09", "score":7.92920307234519}, {"colorCode":"E08", "score":8.96720641670024}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FB2.json b/uml2es/examples/blockFactory/data/blockfactory/color/FB2.json deleted file mode 100644 index 30bc0ad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FB2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FB2", "rgbString":"058fd0", "name":"Fluorescent Dull Blue", "rgb":[5, 143, 208], "cie":[56.3185892223072, -8.15576634088955, -42.1727950678915], "hue":"FB", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"B18", "score":1.53030536930093}, {"colorCode":"BV13", "score":6.23729226425326}, {"colorCode":"BV04", "score":7.21584077267403}, {"colorCode":"BV25", "score":7.81105956619899}, {"colorCode":"B29", "score":8.07675971339497}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FBG2.json b/uml2es/examples/blockFactory/data/blockfactory/color/FBG2.json deleted file mode 100644 index 1e227f0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FBG2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FBG2", "rgbString":"62cbe8", "name":"Fluorescent Dull Blue Green", "rgb":[98, 203, 232], "cie":[76.7605538090868, -22.1665227307463, -23.5379030081177], "hue":"FBG", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"B14", "score":1.96870039018266}, {"colorCode":"B04", "score":2.13967156288115}, {"colorCode":"B05", "score":3.25117181378871}, {"colorCode":"B24", "score":3.43967394515819}, {"colorCode":"BG05", "score":4.16662684059502}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FRV1.json b/uml2es/examples/blockFactory/data/blockfactory/color/FRV1.json deleted file mode 100644 index f350608..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FRV1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FRV1", "rgbString":"f5a3c7", "name":"Fluorescent Pink", "rgb":[245, 163, 199], "cie":[75.9034738405715, 35.2986127639959, -5.88996394682735], "hue":"FRV", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"RV55", "score":1.70061791363341}, {"colorCode":"V04", "score":2.54316985973887}, {"colorCode":"RV04", "score":2.7259450976224}, {"colorCode":"V05", "score":2.80026937491265}, {"colorCode":"R83", "score":3.59640135576999}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FV2.json b/uml2es/examples/blockFactory/data/blockfactory/color/FV2.json deleted file mode 100644 index f489429..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FV2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FV2", "rgbString":"7f74b6", "name":"Fluorescent Dull Violet", "rgb":[127, 116, 182], "cie":[52.2643859016382, 19.3148031639454, -33.4041101732107], "hue":"FV", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"BV17", "score":3.87496440939093}, {"colorCode":"V25", "score":5.3104796037664}, {"colorCode":"BV08", "score":5.5070517421544}, {"colorCode":"B97", "score":6.28757559669358}, {"colorCode":"V95", "score":7.28469313766334}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FY1.json b/uml2es/examples/blockFactory/data/blockfactory/color/FY1.json deleted file mode 100644 index 6343674..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FY1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FY1", "rgbString":"fff697", "name":"Fluorescent Yellow Orange", "rgb":[255, 246, 151], "cie":[95.7497899919678, -10.0246025190697, 46.7031503954757], "hue":"FY", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"Y02", "score":1.51604592140794}, {"colorCode":"Y13", "score":3.46451814465924}, {"colorCode":"YG23", "score":4.88388544662388}, {"colorCode":"Y15", "score":6.09257368952905}, {"colorCode":"Y06", "score":6.13926628943467}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FYG1.json b/uml2es/examples/blockFactory/data/blockfactory/color/FYG1.json deleted file mode 100644 index 9f5e444..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FYG1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FYG1", "rgbString":"9ecd43", "name":"Fluorescent Yellow", "rgb":[158, 205, 67], "cie":[76.8826920488918, -35.45486758175, 60.9782175678457], "hue":"FYG", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"FYG2", "score":0}, {"colorCode":"YG07", "score":1.52984474326652}, {"colorCode":"YG95", "score":4.40031140181606}, {"colorCode":"YG09", "score":4.94790867258021}, {"colorCode":"G09", "score":5.29379415561629}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FYG2.json b/uml2es/examples/blockFactory/data/blockfactory/color/FYG2.json deleted file mode 100644 index a360c87..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FYG2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FYG2", "rgbString":"9ecd43", "name":"Fluor Dull Yellow Green", "rgb":[158, 205, 67], "cie":[76.8826920488918, -35.45486758175, 60.9782175678457], "hue":"FYG", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"FYG1", "score":0}, {"colorCode":"YG07", "score":1.52984474326652}, {"colorCode":"YG95", "score":4.40031140181606}, {"colorCode":"YG09", "score":4.94790867258021}, {"colorCode":"G09", "score":5.29379415561629}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/FYR1.json b/uml2es/examples/blockFactory/data/blockfactory/color/FYR1.json deleted file mode 100644 index ee70a17..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/FYR1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"FYR1", "rgbString":"fecc99", "name":"Fluorescent Orange", "rgb":[254, 204, 153], "cie":[85.2794688333267, 11.1143365713576, 32.1140015480859], "hue":"FYR", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"YR82", "score":2.39400623345087}, {"colorCode":"E34", "score":4.08597907849408}, {"colorCode":"E15", "score":4.68527990260223}, {"colorCode":"YR31", "score":4.88079038496233}, {"colorCode":"R21", "score":4.93820672763121}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G00.json b/uml2es/examples/blockFactory/data/blockfactory/color/G00.json deleted file mode 100644 index f48e81e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G00", "rgbString":"e3f2ed", "name":"Jade Green", "rgb":[227, 242, 237], "cie":[94.2907884279612, -5.84378128200241, 0.695156478871062], "hue":"G", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"BG000", "score":0.772195326115586}, {"colorCode":"B000", "score":1.22005762800402}, {"colorCode":"G000", "score":1.26366283679604}, {"colorCode":"BG10", "score":1.26992218895728}, {"colorCode":"W0", "score":1.77967630671973}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G000.json b/uml2es/examples/blockFactory/data/blockfactory/color/G000.json deleted file mode 100644 index 3dd6c1a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G000", "rgbString":"eaf5ed", "name":"Pale Green", "rgb":[234, 245, 237], "cie":[95.5434923061017, -5.05522282165288, 2.57870100972775], "hue":"G", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"BG000", "score":0.844897860889954}, {"colorCode":"G00", "score":1.26382775068382}, {"colorCode":"BG0000", "score":1.78716485463624}, {"colorCode":"B0000", "score":2.29464073427486}, {"colorCode":"C00", "score":2.35927384487878}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/G0000.json deleted file mode 100644 index 487a9bd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G0000", "rgbString":"f1f7f3", "name":"Crystal Opal", "rgb":[241, 247, 243], "cie":[96.6948215753299, -2.68597638065632, 1.21648351064867], "hue":"G", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"BG0000", "score":1.00700844687432}, {"colorCode":"W00", "score":1.45122685017386}, {"colorCode":"B000", "score":2.25460509100351}, {"colorCode":"G000", "score":2.66814788259156}, {"colorCode":"V0000", "score":2.96549253007936}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G02.json b/uml2es/examples/blockFactory/data/blockfactory/color/G02.json deleted file mode 100644 index d101dfa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G02", "rgbString":"cfe8d3", "name":"Spectrum Green", "rgb":[207, 232, 211], "cie":[89.711382700279, -12.1152462559199, 7.42420425758092], "hue":"G", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"YG41", "score":1.21645894782868}, {"colorCode":"YG61", "score":1.54814204987281}, {"colorCode":"G21", "score":2.45945592896209}, {"colorCode":"G12", "score":3.75405900488401}, {"colorCode":"YG11", "score":3.90272006750739}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G03.json b/uml2es/examples/blockFactory/data/blockfactory/color/G03.json deleted file mode 100644 index bd5f2e0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G03.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G03", "rgbString":"b6da9c", "name":"Meadow Green", "rgb":[182, 218, 156], "cie":[83.1723580647841, -22.8638419140267, 26.728494409366], "hue":"G", "saturation":"0", "brightness":"3", "alternatives":[{"colorCode":"YG06", "score":3.10237870520995}, {"colorCode":"YG45", "score":4.25249029498082}, {"colorCode":"G24", "score":4.7902214323041}, {"colorCode":"YG13", "score":5.08126225406529}, {"colorCode":"G14", "score":5.44525420793629}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G05.json b/uml2es/examples/blockFactory/data/blockfactory/color/G05.json deleted file mode 100644 index acedada..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G05.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G05", "rgbString":"69c07b", "name":"Emerald Green", "rgb":[105, 192, 123], "cie":[70.9622393422299, -41.155446791498, 26.8455342088244], "hue":"G", "saturation":"0", "brightness":"5", "alternatives":[{"colorCode":"G07", "score":2.27249938295829}, {"colorCode":"G09", "score":3.08980982415008}, {"colorCode":"YG09", "score":3.2273589800801}, {"colorCode":"YG67", "score":4.19543594787442}, {"colorCode":"G17", "score":6.24695601211293}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G07.json b/uml2es/examples/blockFactory/data/blockfactory/color/G07.json deleted file mode 100644 index 4b9f131..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G07.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G07", "rgbString":"7bc576", "name":"Nile Green", "rgb":[123, 197, 118], "cie":[73.1881759936709, -38.766985622654, 32.5294111640492], "hue":"G", "saturation":"0", "brightness":"7", "alternatives":[{"colorCode":"G09", "score":2.19952019187929}, {"colorCode":"G05", "score":2.27065743581327}, {"colorCode":"YG09", "score":3.87109346463982}, {"colorCode":"YG17", "score":4.45555444696291}, {"colorCode":"YG67", "score":4.53275206747504}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G09.json b/uml2es/examples/blockFactory/data/blockfactory/color/G09.json deleted file mode 100644 index 50f2b2d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G09.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G09", "rgbString":"7ac465", "name":"Veronese Green", "rgb":[122, 196, 101], "cie":[72.5992451057088, -41.0266670805088, 40.3614742200425], "hue":"G", "saturation":"0", "brightness":"9", "alternatives":[{"colorCode":"YG09", "score":0.797904689330216}, {"colorCode":"G07", "score":2.02235807337846}, {"colorCode":"YG17", "score":2.22398191287306}, {"colorCode":"G05", "score":2.85912282754321}, {"colorCode":"FYG1", "score":5.60629422904587}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G12.json b/uml2es/examples/blockFactory/data/blockfactory/color/G12.json deleted file mode 100644 index c5bf5d0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G12.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G12", "rgbString":"d2e8c4", "name":"Sea Green", "rgb":[210, 232, 196], "cie":[89.5802076831963, -13.6721508529121, 15.0861568142087], "hue":"G", "saturation":"1", "brightness":"2", "alternatives":[{"colorCode":"G21", "score":2.60730740522189}, {"colorCode":"G02", "score":3.21252850865414}, {"colorCode":"YG41", "score":3.40397379950107}, {"colorCode":"BG32", "score":3.9714869849542}, {"colorCode":"YG11", "score":4.08298947925842}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G14.json b/uml2es/examples/blockFactory/data/blockfactory/color/G14.json deleted file mode 100644 index 6d5bf6c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G14.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G14", "rgbString":"97cf90", "name":"Apple Green", "rgb":[151, 207, 144], "cie":[78.0038695661231, -30.1535262045666, 25.6697021318185], "hue":"G", "saturation":"1", "brightness":"4", "alternatives":[{"colorCode":"YG63", "score":4.69411633587658}, {"colorCode":"G03", "score":5.40788119204795}, {"colorCode":"YG67", "score":6.02134868645112}, {"colorCode":"G07", "score":6.23247343543829}, {"colorCode":"YG93", "score":6.47755896372651}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G16.json b/uml2es/examples/blockFactory/data/blockfactory/color/G16.json deleted file mode 100644 index 53f2a3f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G16.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G16", "rgbString":"60c198", "name":"Malachite", "rgb":[96, 193, 152], "cie":[71.4827791561211, -38.3159502492668, 11.9913206653674], "hue":"G", "saturation":"1", "brightness":"6", "alternatives":[{"colorCode":"G19", "score":5.30826941578146}, {"colorCode":"YG67", "score":6.53338203573628}, {"colorCode":"YG63", "score":7.6882578735341}, {"colorCode":"G17", "score":8.13723645578469}, {"colorCode":"G05", "score":8.25508837608581}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G17.json b/uml2es/examples/blockFactory/data/blockfactory/color/G17.json deleted file mode 100644 index b93e047..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G17", "rgbString":"14b37d", "name":"Forest Green", "rgb":[20, 179, 125], "cie":[64.8589261560955, -50.5891962087793, 17.1406659786244], "hue":"G", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"G19", "score":2.74154186412478}, {"colorCode":"G05", "score":6.23133201746511}, {"colorCode":"YG17", "score":6.9526336044016}, {"colorCode":"BG18", "score":7.02877278030224}, {"colorCode":"G46", "score":7.39238716569322}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G19.json b/uml2es/examples/blockFactory/data/blockfactory/color/G19.json deleted file mode 100644 index 7bbd127..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G19.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G19", "rgbString":"2db98a", "name":"Bright Parrot Green", "rgb":[45, 185, 138], "cie":[67.3450896142788, -47.5843500311198, 13.5698769343817], "hue":"G", "saturation":"1", "brightness":"9", "alternatives":[{"colorCode":"G17", "score":2.76884684501971}, {"colorCode":"BG18", "score":4.4588880296377}, {"colorCode":"G16", "score":5.0484293907823}, {"colorCode":"YG67", "score":6.30059433858039}, {"colorCode":"BG57", "score":7.94195537129198}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G20.json b/uml2es/examples/blockFactory/data/blockfactory/color/G20.json deleted file mode 100644 index 36c8a2d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G20.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G20", "rgbString":"edf6db", "name":"Wax White", "rgb":[237, 246, 219], "cie":[95.5931780630445, -7.61134352419479, 11.9683354049884], "hue":"G", "saturation":"2", "brightness":"0", "alternatives":[{"colorCode":"YG0000", "score":1.58612679677537}, {"colorCode":"YG11", "score":2.87943378031027}, {"colorCode":"G40", "score":2.94692264493978}, {"colorCode":"Y00", "score":3.15806201460345}, {"colorCode":"YR0000", "score":3.65445645292642}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G21.json b/uml2es/examples/blockFactory/data/blockfactory/color/G21.json deleted file mode 100644 index 2ec2b33..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G21", "rgbString":"c4e4cd", "name":"Lime Green", "rgb":[196, 228, 205], "cie":[87.7903566927113, -14.8441311350838, 7.70964972679076], "hue":"G", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"G02", "score":2.39871868490148}, {"colorCode":"G12", "score":2.73858847020084}, {"colorCode":"YG41", "score":3.41069136725675}, {"colorCode":"BG02", "score":3.48508283527815}, {"colorCode":"YG61", "score":3.8188850953998}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G24.json b/uml2es/examples/blockFactory/data/blockfactory/color/G24.json deleted file mode 100644 index f939ed0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G24.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G24", "rgbString":"c3e0b4", "name":"Willow", "rgb":[195, 224, 180], "cie":[86.1106977642951, -17.502602177551, 18.4100847242108], "hue":"G", "saturation":"2", "brightness":"4", "alternatives":[{"colorCode":"YG45", "score":2.03163650146911}, {"colorCode":"G82", "score":3.54110133182985}, {"colorCode":"G12", "score":4.1920795813658}, {"colorCode":"G21", "score":4.38269080333002}, {"colorCode":"E43", "score":4.58875792943812}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G28.json b/uml2es/examples/blockFactory/data/blockfactory/color/G28.json deleted file mode 100644 index 33a92f1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G28.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G28", "rgbString":"119462", "name":"Ocean Green", "rgb":[17, 148, 98], "cie":[54.2183358697574, -44.8804518428261, 17.4290766668887], "hue":"G", "saturation":"2", "brightness":"8", "alternatives":[{"colorCode":"G46", "score":6.73612055028114}, {"colorCode":"G29", "score":8.82376331666177}, {"colorCode":"BG75", "score":9.28218012032718}, {"colorCode":"BG99", "score":10.6815866137278}, {"colorCode":"G17", "score":10.7698688229558}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G29.json b/uml2es/examples/blockFactory/data/blockfactory/color/G29.json deleted file mode 100644 index b02a787..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G29.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G29", "rgbString":"197c5d", "name":"Pine Tree Green", "rgb":[25, 124, 93], "cie":[46.1937932664293, -35.3508686270089, 9.19072913594514], "hue":"G", "saturation":"2", "brightness":"9", "alternatives":[{"colorCode":"BG78", "score":8.34559692742453}, {"colorCode":"G28", "score":9.14944132514666}, {"colorCode":"E87", "score":9.85500918071404}, {"colorCode":"BV25", "score":11.6573552620095}, {"colorCode":"E59", "score":11.8842445236174}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G40.json b/uml2es/examples/blockFactory/data/blockfactory/color/G40.json deleted file mode 100644 index 860e01f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G40.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G40", "rgbString":"e4f1df", "name":"Dim Green", "rgb":[228, 241, 223], "cie":[93.7676330071175, -7.49298885899036, 7.20298346435782], "hue":"G", "saturation":"4", "brightness":"0", "alternatives":[{"colorCode":"YG0000", "score":2.74399125427036}, {"colorCode":"BG000", "score":2.95244994721686}, {"colorCode":"G00", "score":3.11612340517881}, {"colorCode":"G20", "score":3.16233200990788}, {"colorCode":"BG70", "score":3.21626389566251}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G43.json b/uml2es/examples/blockFactory/data/blockfactory/color/G43.json deleted file mode 100644 index 2933782..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G43.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G43", "rgbString":"d7e7a8", "name":"Various Pistachio", "rgb":[215, 231, 168], "cie":[89.1234617305669, -15.6319649335221, 28.9735439468906], "hue":"G", "saturation":"4", "brightness":"3", "alternatives":[{"colorCode":"YG03", "score":1.32706212377645}, {"colorCode":"YG13", "score":1.70018030560825}, {"colorCode":"YG01", "score":2.47171595252318}, {"colorCode":"YG05", "score":4.0707051814729}, {"colorCode":"G24", "score":4.27302112929924}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G46.json b/uml2es/examples/blockFactory/data/blockfactory/color/G46.json deleted file mode 100644 index a61cca6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G46.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G46", "rgbString":"579e74", "name":"Sketch Mistletoe", "rgb":[87, 158, 116], "cie":[59.6539417083109, -32.1609772948178, 15.1420687300985], "hue":"G", "saturation":"4", "brightness":"6", "alternatives":[{"colorCode":"BG99", "score":5.85343898926563}, {"colorCode":"BG75", "score":6.9415107653446}, {"colorCode":"G28", "score":7.28234160135265}, {"colorCode":"G17", "score":8.62135537185458}, {"colorCode":"BG96", "score":8.6614246056197}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G82.json b/uml2es/examples/blockFactory/data/blockfactory/color/G82.json deleted file mode 100644 index 2ba7c46..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G82.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G82", "rgbString":"ccdab9", "name":"Spring Dim Green", "rgb":[204, 218, 185], "cie":[85.2421679435955, -10.5180232305866, 14.6627522775303], "hue":"G", "saturation":"8", "brightness":"2", "alternatives":[{"colorCode":"YG45", "score":3.71712694484735}, {"colorCode":"G24", "score":4.15201560139125}, {"colorCode":"E55", "score":4.42664101430826}, {"colorCode":"G12", "score":4.52220343152961}, {"colorCode":"G02", "score":4.94524285734127}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G85.json b/uml2es/examples/blockFactory/data/blockfactory/color/G85.json deleted file mode 100644 index 962de11..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G85.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G85", "rgbString":"9dc3aa", "name":"Verdigris", "rgb":[157, 195, 170], "cie":[75.5138648902996, -17.6646711199762, 8.40694143948484], "hue":"G", "saturation":"8", "brightness":"5", "alternatives":[{"colorCode":"YG63", "score":4.23605531110394}, {"colorCode":"BG57", "score":5.9157032533203}, {"colorCode":"B52", "score":6.08047229829287}, {"colorCode":"BG53", "score":6.55082590763545}, {"colorCode":"C4", "score":7.36210855202802}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G94.json b/uml2es/examples/blockFactory/data/blockfactory/color/G94.json deleted file mode 100644 index 89112ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G94.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G94", "rgbString":"98a786", "name":"Grayish Olive", "rgb":[152, 167, 134], "cie":[66.5459435750751, -11.3663140945091, 15.3317301568635], "hue":"G", "saturation":"9", "brightness":"4", "alternatives":[{"colorCode":"BG96", "score":3.2762585237623}, {"colorCode":"C4", "score":8.85342643997147}, {"colorCode":"G85", "score":8.97160262319524}, {"colorCode":"W5", "score":9.12524274290759}, {"colorCode":"T5", "score":9.27585446615485}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/G99.json b/uml2es/examples/blockFactory/data/blockfactory/color/G99.json deleted file mode 100644 index f65191e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/G99.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"G99", "rgbString":"5f7e3a", "name":"Olive", "rgb":[95, 126, 58], "cie":[49.0812153452265, -23.2783497281096, 33.1342446686167], "hue":"G", "saturation":"9", "brightness":"9", "alternatives":[{"colorCode":"YG99", "score":8.26526917223566}, {"colorCode":"E27", "score":8.31439780219722}, {"colorCode":"E77", "score":9.75048483989761}, {"colorCode":"BG78", "score":10.2007844119084}, {"colorCode":"BG75", "score":10.4234874733314}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N0.json b/uml2es/examples/blockFactory/data/blockfactory/color/N0.json deleted file mode 100644 index 04e15fa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N0.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N0", "rgbString":"eceeed", "name":"Neutral Gray", "rgb":[236, 238, 237], "cie":[93.9246240379962, -0.838943422389438, 0.238789311097132], "hue":"N", "saturation":"0", "brightness":"-", "alternatives":[{"colorCode":"T0", "score":0}, {"colorCode":"T1", "score":1.28524009574823}, {"colorCode":"E70", "score":2.00748362744976}, {"colorCode":"C00", "score":2.23711348175014}, {"colorCode":"BG90", "score":2.6912268390189}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N1.json b/uml2es/examples/blockFactory/data/blockfactory/color/N1.json deleted file mode 100644 index 301ba7b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N1", "rgbString":"e2e3e5", "name":"Neutral Gray", "rgb":[226, 227, 229], "cie":[90.2129102181832, 0.0293489550284853, -1.1008369014704], "hue":"N", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"T2", "score":2.33647619332173}, {"colorCode":"T1", "score":2.43561647151062}, {"colorCode":"N2", "score":2.83056401020356}, {"colorCode":"C1", "score":2.85690943441458}, {"colorCode":"C0", "score":2.89606593771379}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N10.json b/uml2es/examples/blockFactory/data/blockfactory/color/N10.json deleted file mode 100644 index bf120c5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N10.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N10", "rgbString":"312f30", "name":"Neutral Gray", "rgb":[49, 47, 48], "cie":[19.6364110248934, 1.12230120308732, -0.326145905431607], "hue":"N", "saturation":"1", "brightness":"0", "alternatives":[{"colorCode":"T10", "score":0.88437255809313}, {"colorCode":"100", "score":2.21522411507693}, {"colorCode":"W10", "score":3.36047513126666}, {"colorCode":"C10", "score":5.54447422352016}, {"colorCode":"C9", "score":10.745397383173}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N2.json b/uml2es/examples/blockFactory/data/blockfactory/color/N2.json deleted file mode 100644 index ec9cd12..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N2", "rgbString":"dadbdd", "name":"Neutral Gray", "rgb":[218, 219, 221], "cie":[87.3823543252255, 0.0294928424018348, -1.10795036206615], "hue":"N", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"T2", "score":2.71082842588236}, {"colorCode":"N1", "score":2.83056400525353}, {"colorCode":"W2", "score":2.95302966301896}, {"colorCode":"N3", "score":3.20774740080474}, {"colorCode":"E71", "score":3.31759074569616}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N3.json b/uml2es/examples/blockFactory/data/blockfactory/color/N3.json deleted file mode 100644 index e645fb9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N3.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N3", "rgbString":"d1d2d4", "name":"Neutral Gray", "rgb":[209, 210, 212], "cie":[84.1746168380116, 0.0296729578713739, -1.1163212803472], "hue":"N", "saturation":"3", "brightness":"-", "alternatives":[{"colorCode":"N2", "score":3.2077473936931}, {"colorCode":"C2", "score":3.82621539576323}, {"colorCode":"T3", "score":4.11574300741263}, {"colorCode":"E71", "score":4.1352595130194}, {"colorCode":"C3", "score":4.62327789139667}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N4.json b/uml2es/examples/blockFactory/data/blockfactory/color/N4.json deleted file mode 100644 index 0d6c96c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N4.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N4", "rgbString":"bcbdc1", "name":"Neutral Gray", "rgb":[188, 189, 193], "cie":[76.6407184383647, 0.407468461287697, -2.14337143870889], "hue":"N", "saturation":"4", "brightness":"-", "alternatives":[{"colorCode":"T4", "score":1.21051963327754}, {"colorCode":"W4", "score":5.19401811386239}, {"colorCode":"C3", "score":5.3932391924275}, {"colorCode":"C4", "score":5.97527770797377}, {"colorCode":"BG93", "score":6.59572712009582}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N5.json b/uml2es/examples/blockFactory/data/blockfactory/color/N5.json deleted file mode 100644 index 5357609..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N5.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N5", "rgbString":"a8a9ad", "name":"Neutral Gray", "rgb":[168, 169, 173], "cie":[69.2681285047203, 0.416785562412203, -2.1871570629113], "hue":"N", "saturation":"5", "brightness":"-", "alternatives":[{"colorCode":"T5", "score":4.37340170105486}, {"colorCode":"W5", "score":4.77736517395637}, {"colorCode":"C4", "score":5.36140015374761}, {"colorCode":"C5", "score":6.58079840529399}, {"colorCode":"T4", "score":6.713130482925}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N6.json b/uml2es/examples/blockFactory/data/blockfactory/color/N6.json deleted file mode 100644 index d2f9c20..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N6.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N6", "rgbString":"949599", "name":"Neutral Gray", "rgb":[148, 149, 153], "cie":[61.7324012884555, 0.427640321569112, -2.23712765903479], "hue":"N", "saturation":"6", "brightness":"-", "alternatives":[{"colorCode":"T6", "score":4.88576724946064}, {"colorCode":"W6", "score":5.41935450329318}, {"colorCode":"C5", "score":6.0767768036615}, {"colorCode":"C6", "score":7.09981370310144}, {"colorCode":"W5", "score":7.3072332095549}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N7.json b/uml2es/examples/blockFactory/data/blockfactory/color/N7.json deleted file mode 100644 index 66f13a3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N7.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N7", "rgbString":"77787c", "name":"Neutral Gray", "rgb":[119, 120, 124], "cie":[50.464307142735, 0.447219257222353, -2.32441980321358], "hue":"N", "saturation":"7", "brightness":"-", "alternatives":[{"colorCode":"T7", "score":1.3036463104569}, {"colorCode":"W7", "score":5.07473990958319}, {"colorCode":"C7", "score":5.9100531399684}, {"colorCode":"N8", "score":8.17646313304905}, {"colorCode":"W8", "score":8.34262652009256}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N8.json b/uml2es/examples/blockFactory/data/blockfactory/color/N8.json deleted file mode 100644 index 8d5671a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N8.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N8", "rgbString":"636466", "name":"Neutral Gray", "rgb":[99, 100, 102], "cie":[42.3479210305777, 0.0351133467729747, -1.27182695857315], "hue":"N", "saturation":"8", "brightness":"-", "alternatives":[{"colorCode":"W8", "score":4.11915679325348}, {"colorCode":"T8", "score":4.11915679325348}, {"colorCode":"C8", "score":6.14673477469444}, {"colorCode":"C7", "score":6.95430785101177}, {"colorCode":"T7", "score":7.31738625214588}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/N9.json b/uml2es/examples/blockFactory/data/blockfactory/color/N9.json deleted file mode 100644 index 2f147a5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/N9.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"N9", "rgbString":"4c4d4f", "name":"Neutral Gray", "rgb":[76, 77, 79], "cie":[32.7199279744322, 0.038168842213776, -1.32885692588393], "hue":"N", "saturation":"9", "brightness":"-", "alternatives":[{"colorCode":"T9", "score":2.72803190226883}, {"colorCode":"W9", "score":4.30462096349624}, {"colorCode":"C9", "score":5.39006108840856}, {"colorCode":"C8", "score":8.01749880093016}, {"colorCode":"W8", "score":9.56095897336772}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R00.json b/uml2es/examples/blockFactory/data/blockfactory/color/R00.json deleted file mode 100644 index 0d9d31e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R00", "rgbString":"feeae1", "name":"Pinkish White", "rgb":[254, 234, 225], "cie":[94.0348937447398, 5.32124566809938, 6.80563447398879], "hue":"R", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"E01", "score":1.21594062959702}, {"colorCode":"E02", "score":1.54496617596636}, {"colorCode":"E41", "score":1.81393818641189}, {"colorCode":"E40", "score":1.89546351971737}, {"colorCode":"R30", "score":1.99352366928189}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R000.json b/uml2es/examples/blockFactory/data/blockfactory/color/R000.json deleted file mode 100644 index 817c75a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R000", "rgbString":"fef0e7", "name":"Cherry White", "rgb":[254, 240, 231], "cie":[95.6474652375537, 3.22007073661124, 6.0201098113301], "hue":"R", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"E01", "score":1.03002818179696}, {"colorCode":"E00", "score":1.0653918860508}, {"colorCode":"YR0000", "score":1.39707226017121}, {"colorCode":"E41", "score":2.0016127813199}, {"colorCode":"E02", "score":2.02141198978706}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/R0000.json deleted file mode 100644 index 2717787..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R0000", "rgbString":"fef3ef", "name":"Pink Beryl", "rgb":[254, 243, 239], "cie":[96.5761534257964, 3.01018107780854, 3.22841308062991], "hue":"R", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"E00", "score":1.1849505485784}, {"colorCode":"E000", "score":1.63702159643149}, {"colorCode":"E0000", "score":2.06449395169512}, {"colorCode":"R000", "score":2.21712149444344}, {"colorCode":"Y0000", "score":2.88676553187004}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R01.json b/uml2es/examples/blockFactory/data/blockfactory/color/R01.json deleted file mode 100644 index 76de114..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R01", "rgbString":"fde0d8", "name":"Pinkish Vanilla", "rgb":[253, 224, 216], "cie":[91.3029424146587, 8.70230863606142, 7.55460947766242], "hue":"R", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"R30", "score":1.62738211356279}, {"colorCode":"R11", "score":1.73506289462134}, {"colorCode":"RV11", "score":2.97050213605854}, {"colorCode":"E40", "score":3.10203443070963}, {"colorCode":"E51", "score":3.15298750458194}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R02.json b/uml2es/examples/blockFactory/data/blockfactory/color/R02.json deleted file mode 100644 index 5d4c0ce..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R02", "rgbString":"fdd3c7", "name":"Flesh", "rgb":[253, 211, 199], "cie":[87.7731370002105, 12.9072611546219, 11.4322794008154], "hue":"R", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"R20", "score":1.85179389680612}, {"colorCode":"R12", "score":2.3648759984548}, {"colorCode":"E93", "score":2.5540017742196}, {"colorCode":"RV32", "score":2.79881586481594}, {"colorCode":"E33", "score":2.97188959034955}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R05.json b/uml2es/examples/blockFactory/data/blockfactory/color/R05.json deleted file mode 100644 index af476a6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R05.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R05", "rgbString":"f6927b", "name":"Salmon Red", "rgb":[246, 146, 123], "cie":[70.5808370526905, 35.3783942672586, 28.4115656119364], "hue":"R", "saturation":"0", "brightness":"5", "alternatives":[{"colorCode":"R14", "score":3.40081166609628}, {"colorCode":"R17", "score":4.0194414986943}, {"colorCode":"RV04", "score":6.31722052017625}, {"colorCode":"R24", "score":6.86256383355355}, {"colorCode":"YR65", "score":7.01691011122627}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R08.json b/uml2es/examples/blockFactory/data/blockfactory/color/R08.json deleted file mode 100644 index b145960..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R08.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R08", "rgbString":"f26754", "name":"Vermilion", "rgb":[242, 103, 84], "cie":[60.9733989673618, 52.2584800744956, 37.4746596355267], "hue":"R", "saturation":"0", "brightness":"8", "alternatives":[{"colorCode":"R35", "score":3.9439551837932}, {"colorCode":"E09", "score":4.1545691983123}, {"colorCode":"R24", "score":4.36643488764563}, {"colorCode":"YR27", "score":5.02294938374344}, {"colorCode":"E39", "score":5.52360454284036}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R11.json b/uml2es/examples/blockFactory/data/blockfactory/color/R11.json deleted file mode 100644 index 434d751..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R11.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R11", "rgbString":"fde1d5", "name":"Pale Cherry Pink", "rgb":[253, 225, 213], "cie":[91.476793557454, 7.72605367305973, 9.37191930388488], "hue":"R", "saturation":"1", "brightness":"1", "alternatives":[{"colorCode":"R01", "score":1.72052587232355}, {"colorCode":"R30", "score":1.89759646986024}, {"colorCode":"E42", "score":2.35932739897727}, {"colorCode":"E51", "score":2.86921996053967}, {"colorCode":"R20", "score":3.06750283889503}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R12.json b/uml2es/examples/blockFactory/data/blockfactory/color/R12.json deleted file mode 100644 index fbfe932..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R12.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R12", "rgbString":"fcd3c1", "name":"Light Tea Rose", "rgb":[252, 211, 193], "cie":[87.550184021067, 11.6922819379137, 14.2649597060878], "hue":"R", "saturation":"1", "brightness":"2", "alternatives":[{"colorCode":"YR00", "score":1.32819543352329}, {"colorCode":"E93", "score":1.79714590908151}, {"colorCode":"YR61", "score":1.89422826291522}, {"colorCode":"E33", "score":2.24600205446433}, {"colorCode":"R02", "score":2.32879993485808}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R14.json b/uml2es/examples/blockFactory/data/blockfactory/color/R14.json deleted file mode 100644 index edad809..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R14.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R14", "rgbString":"f59b92", "name":"Light Rouge", "rgb":[245, 155, 146], "cie":[72.8461009634452, 32.5998723998079, 18.8527577617619], "hue":"R", "saturation":"1", "brightness":"4", "alternatives":[{"colorCode":"R05", "score":3.65108865229148}, {"colorCode":"E25", "score":4.4170469804883}, {"colorCode":"R43", "score":6.22515321180321}, {"colorCode":"RV34", "score":6.35496879133268}, {"colorCode":"RV63", "score":6.65428777109349}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R17.json b/uml2es/examples/blockFactory/data/blockfactory/color/R17.json deleted file mode 100644 index 2fe22ea..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R17", "rgbString":"f4846c", "name":"Lipstick Orange", "rgb":[244, 132, 108], "cie":[67.1405134638637, 40.5428163761283, 32.0757873509428], "hue":"R", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"R05", "score":3.9304587383524}, {"colorCode":"R56", "score":6.96177349170059}, {"colorCode":"R14", "score":7.09680753245326}, {"colorCode":"R08", "score":7.23898399080731}, {"colorCode":"E07", "score":7.5011416503053}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R20.json b/uml2es/examples/blockFactory/data/blockfactory/color/R20.json deleted file mode 100644 index 87afcad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R20.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R20", "rgbString":"fcd7cf", "name":"Blush", "rgb":[252, 215, 207], "cie":[88.8284978294834, 11.6398830741479, 8.71342327745459], "hue":"R", "saturation":"2", "brightness":"0", "alternatives":[{"colorCode":"RV32", "score":1.18563221554276}, {"colorCode":"R02", "score":1.9447463274952}, {"colorCode":"R12", "score":2.6841601151165}, {"colorCode":"R11", "score":3.01789029933744}, {"colorCode":"R01", "score":3.07353684075739}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R21.json b/uml2es/examples/blockFactory/data/blockfactory/color/R21.json deleted file mode 100644 index a2d8b29..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R21", "rgbString":"fac1b6", "name":"Sardonyx", "rgb":[250, 193, 182], "cie":[82.8289637526754, 18.8638614819235, 13.4008876743349], "hue":"R", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"R32", "score":1.50722615498192}, {"colorCode":"RV42", "score":1.66117962370232}, {"colorCode":"R22", "score":2.96284161285176}, {"colorCode":"E93", "score":4.5483714087102}, {"colorCode":"E04", "score":4.72723563143767}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R22.json b/uml2es/examples/blockFactory/data/blockfactory/color/R22.json deleted file mode 100644 index 4c45834..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R22.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R22", "rgbString":"f8b7b1", "name":"Light Prawn", "rgb":[248, 183, 177], "cie":[80.1783321951294, 22.724279976389, 12.3044489848025], "hue":"R", "saturation":"2", "brightness":"2", "alternatives":[{"colorCode":"RV42", "score":1.34652336008281}, {"colorCode":"RV34", "score":2.38620011969785}, {"colorCode":"R21", "score":2.93034069137087}, {"colorCode":"R32", "score":3.14508509753305}, {"colorCode":"E13", "score":3.90532112342817}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R24.json b/uml2es/examples/blockFactory/data/blockfactory/color/R24.json deleted file mode 100644 index 459e6f5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R24.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R24", "rgbString":"f27579", "name":"Prawn", "rgb":[242, 117, 121], "cie":[64.1449560105351, 48.3316342506795, 20.807711558339], "hue":"R", "saturation":"2", "brightness":"4", "alternatives":[{"colorCode":"R37", "score":3.23973137160144}, {"colorCode":"R43", "score":3.95046732708756}, {"colorCode":"R35", "score":4.5470747840378}, {"colorCode":"R08", "score":4.70085379588928}, {"colorCode":"R56", "score":5.30013682257531}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R27.json b/uml2es/examples/blockFactory/data/blockfactory/color/R27.json deleted file mode 100644 index fd34e12..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R27.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R27", "rgbString":"f15062", "name":"Cadmium Red", "rgb":[241, 80, 98], "cie":[57.3858262619719, 62.5415578084329, 24.9533911305658], "hue":"R", "saturation":"2", "brightness":"7", "alternatives":[{"colorCode":"R46", "score":3.5320190922631}, {"colorCode":"R37", "score":5.13033517674943}, {"colorCode":"E08", "score":5.56631025709257}, {"colorCode":"R35", "score":7.2031513160563}, {"colorCode":"R29", "score":7.39068049810817}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R29.json b/uml2es/examples/blockFactory/data/blockfactory/color/R29.json deleted file mode 100644 index 54f093a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R29.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R29", "rgbString":"ed174b", "name":"Lipstick Red", "rgb":[237, 23, 75], "cie":[50.83349985991, 75.3599726808683, 30.0075292315986], "hue":"R", "saturation":"2", "brightness":"9", "alternatives":[{"colorCode":"E19", "score":5.14417317446815}, {"colorCode":"R46", "score":5.47371595432055}, {"colorCode":"RV29", "score":6.49301167368086}, {"colorCode":"YR27", "score":6.75297175001333}, {"colorCode":"R27", "score":7.19115816838164}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R30.json b/uml2es/examples/blockFactory/data/blockfactory/color/R30.json deleted file mode 100644 index 6b5307e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R30.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R30", "rgbString":"fce3df", "name":"Pale Yellowish Pink", "rgb":[252, 227, 223], "cie":[92.1144808786522, 7.90329690259739, 5.05546374881054], "hue":"R", "saturation":"3", "brightness":"0", "alternatives":[{"colorCode":"R01", "score":1.71091922831291}, {"colorCode":"RV21", "score":1.94467552139831}, {"colorCode":"R00", "score":1.99018646472266}, {"colorCode":"R11", "score":2.04549233152652}, {"colorCode":"E11", "score":2.61841846533663}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R32.json b/uml2es/examples/blockFactory/data/blockfactory/color/R32.json deleted file mode 100644 index 0d96270..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R32.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R32", "rgbString":"fac1ba", "name":"Peach", "rgb":[250, 193, 186], "cie":[82.918255262291, 19.4061877061165, 11.3901178611624], "hue":"R", "saturation":"3", "brightness":"2", "alternatives":[{"colorCode":"R21", "score":1.51842463441726}, {"colorCode":"RV42", "score":1.85247360373808}, {"colorCode":"R22", "score":3.20327427352367}, {"colorCode":"E04", "score":4.58329764813251}, {"colorCode":"R12", "score":5.05164409999826}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R35.json b/uml2es/examples/blockFactory/data/blockfactory/color/R35.json deleted file mode 100644 index 5e97af1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R35.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R35", "rgbString":"f27185", "name":"Coral", "rgb":[242, 113, 133], "cie":[63.6564977670823, 51.3573311949396, 13.2970196733673], "hue":"R", "saturation":"3", "brightness":"5", "alternatives":[{"colorCode":"R08", "score":4.27088595509017}, {"colorCode":"R43", "score":4.38808902658617}, {"colorCode":"R37", "score":4.44100199019452}, {"colorCode":"R24", "score":4.53090967363181}, {"colorCode":"R56", "score":5.20617690924331}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R37.json b/uml2es/examples/blockFactory/data/blockfactory/color/R37.json deleted file mode 100644 index 7d8b368..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R37.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R37", "rgbString":"e86c74", "name":"Carmine", "rgb":[232, 108, 116], "cie":[60.9066441895954, 48.7191669961952, 19.0122442024521], "hue":"R", "saturation":"3", "brightness":"7", "alternatives":[{"colorCode":"R24", "score":3.23974370018115}, {"colorCode":"R35", "score":4.4584056052084}, {"colorCode":"R56", "score":4.8296170312854}, {"colorCode":"R27", "score":5.70152017139181}, {"colorCode":"RV29", "score":6.23228272349402}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R39.json b/uml2es/examples/blockFactory/data/blockfactory/color/R39.json deleted file mode 100644 index 379dc2f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R39.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R39", "rgbString":"cb487a", "name":"Garnet", "rgb":[203, 72, 122], "cie":[50.3773465732856, 56.0499437443078, -0.0425177949243016], "hue":"R", "saturation":"3", "brightness":"9", "alternatives":[{"colorCode":"R59", "score":3.81443816979799}, {"colorCode":"R46", "score":4.09293551594592}, {"colorCode":"RV29", "score":7.04503247657871}, {"colorCode":"RV66", "score":7.24918681940757}, {"colorCode":"R27", "score":7.70620060854196}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R43.json b/uml2es/examples/blockFactory/data/blockfactory/color/R43.json deleted file mode 100644 index c429cce..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R43.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R43", "rgbString":"ee848e", "name":"Bougainvillaea", "rgb":[238, 132, 142], "cie":[67.0005228271397, 41.4968339245675, 12.8016286341943], "hue":"R", "saturation":"4", "brightness":"3", "alternatives":[{"colorCode":"R24", "score":4.22369069115925}, {"colorCode":"R35", "score":4.66859687827458}, {"colorCode":"RV14", "score":5.44965551420453}, {"colorCode":"R56", "score":5.62001578908337}, {"colorCode":"R14", "score":6.1630185999907}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R46.json b/uml2es/examples/blockFactory/data/blockfactory/color/R46.json deleted file mode 100644 index 7838284..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R46.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R46", "rgbString":"e04d69", "name":"Strong Red", "rgb":[224, 77, 105], "cie":[54.2121591893533, 58.9376658286107, 16.0673965216154], "hue":"R", "saturation":"4", "brightness":"6", "alternatives":[{"colorCode":"RV29", "score":2.95934253661055}, {"colorCode":"R27", "score":3.58455911017932}, {"colorCode":"R39", "score":4.06350640922196}, {"colorCode":"R85", "score":5.74204985845474}, {"colorCode":"R29", "score":6.3205534229146}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R56.json b/uml2es/examples/blockFactory/data/blockfactory/color/R56.json deleted file mode 100644 index 8211f74..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R56.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R56", "rgbString":"d27c95", "name":"Currant", "rgb":[210, 124, 149], "cie":[61.9009538033835, 36.4338244768405, 1.04556726699365], "hue":"R", "saturation":"5", "brightness":"6", "alternatives":[{"colorCode":"RV17", "score":3.92319962692639}, {"colorCode":"RV95", "score":4.44973098633195}, {"colorCode":"R85", "score":5.09234649190308}, {"colorCode":"RV09", "score":5.73911466077418}, {"colorCode":"R43", "score":5.7437363600691}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R59.json b/uml2es/examples/blockFactory/data/blockfactory/color/R59.json deleted file mode 100644 index b640ec0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R59.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R59", "rgbString":"b74f70", "name":"Cardinal", "rgb":[183, 79, 112], "cie":[48.0439710834212, 45.3679007949395, 2.20762527079472], "hue":"R", "saturation":"5", "brightness":"9", "alternatives":[{"colorCode":"R39", "score":4.19952667850941}, {"colorCode":"RV66", "score":7.14987463132056}, {"colorCode":"R46", "score":8.03348821898708}, {"colorCode":"RV69", "score":8.08319002888098}, {"colorCode":"YR27", "score":9.48125490426685}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R81.json b/uml2es/examples/blockFactory/data/blockfactory/color/R81.json deleted file mode 100644 index 12e4e84..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R81.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R81", "rgbString":"f1c8d6", "name":"Rose Pink", "rgb":[241, 200, 214], "cie":[84.41379459123, 16.7013328053487, -1.51620987617214], "hue":"R", "saturation":"8", "brightness":"1", "alternatives":[{"colorCode":"RV13", "score":1.67936683214226}, {"colorCode":"V91", "score":2.25541797049461}, {"colorCode":"RV52", "score":2.35201950870433}, {"colorCode":"V01", "score":2.85554792496599}, {"colorCode":"V93", "score":2.90867896591502}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R83.json b/uml2es/examples/blockFactory/data/blockfactory/color/R83.json deleted file mode 100644 index b4cf7e3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R83.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R83", "rgbString":"f19cb9", "name":"Rose Mist", "rgb":[241, 156, 185], "cie":[73.5328721424735, 35.5344969663938, -1.73691848651076], "hue":"R", "saturation":"8", "brightness":"3", "alternatives":[{"colorCode":"RV14", "score":2.09032005771155}, {"colorCode":"RV55", "score":2.15878509453145}, {"colorCode":"RV04", "score":2.29554454234153}, {"colorCode":"V05", "score":2.66693856079841}, {"colorCode":"RV25", "score":3.01137657825053}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R85.json b/uml2es/examples/blockFactory/data/blockfactory/color/R85.json deleted file mode 100644 index 722c9aa..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R85.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R85", "rgbString":"d36a93", "name":"Rose Red", "rgb":[211, 106, 147], "cie":[58.2863561136153, 45.8159864121574, -3.07781701734193], "hue":"R", "saturation":"8", "brightness":"5", "alternatives":[{"colorCode":"V95", "score":4.31601984571415}, {"colorCode":"RV09", "score":4.4469806786355}, {"colorCode":"R56", "score":4.75437235163014}, {"colorCode":"RV66", "score":5.55949532123232}, {"colorCode":"R35", "score":5.85213113777018}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/R89.json b/uml2es/examples/blockFactory/data/blockfactory/color/R89.json deleted file mode 100644 index 5f4b08d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/R89.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"R89", "rgbString":"7d2b42", "name":"Dark Red", "rgb":[125, 43, 66], "cie":[30.5951106425219, 37.5750910488458, 4.81651251652622], "hue":"R", "saturation":"8", "brightness":"9", "alternatives":[{"colorCode":"E49", "score":9.2030011028904}, {"colorCode":"E89", "score":9.32283414603778}, {"colorCode":"RV99", "score":9.62113205912949}, {"colorCode":"E18", "score":11.586803892035}, {"colorCode":"E79", "score":11.813588222065}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV00.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV00.json deleted file mode 100644 index 6ea3765..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV00", "rgbString":"f1daea", "name":"Water Lily", "rgb":[241, 218, 234], "cie":[89.2917632896312, 10.6418635929798, -4.94247164657635], "hue":"RV", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"V12", "score":1.12848006242853}, {"colorCode":"RV02", "score":2.86371434058757}, {"colorCode":"RV91", "score":2.87891102106791}, {"colorCode":"RV000", "score":2.93309674259837}, {"colorCode":"V20", "score":3.23994148651999}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV000.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV000.json deleted file mode 100644 index 8341429..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV000", "rgbString":"f4e2ee", "name":"Pale Purple", "rgb":[244, 226, 238], "cie":[91.5945344107262, 8.19224905966076, -3.62317728273296], "hue":"RV", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"BV000", "score":2.31431351894981}, {"colorCode":"BV0000", "score":2.31431351894981}, {"colorCode":"BV31", "score":2.31431351894981}, {"colorCode":"V20", "score":2.45539850660259}, {"colorCode":"RV0000", "score":2.71742396585151}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV0000.json deleted file mode 100644 index 3135db9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV0000", "rgbString":"f2eaf5", "name":"Evening Primrose", "rgb":[242, 234, 245], "cie":[93.5873398933672, 4.63610935619535, -4.36193276679351], "hue":"RV", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"V0000", "score":1.38386572154249}, {"colorCode":"BV0000", "score":1.49543206021977}, {"colorCode":"BV000", "score":1.49543206021977}, {"colorCode":"BV31", "score":1.49543206021977}, {"colorCode":"RV10", "score":1.51814991600467}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV02.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV02.json deleted file mode 100644 index cb19df1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV02", "rgbString":"fad5e6", "name":"Sugared Almond Pink", "rgb":[250, 213, 230], "cie":[88.745264504262, 15.630509388736, -3.55175743278311], "hue":"RV", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"V12", "score":2.09236661389896}, {"colorCode":"RV00", "score":2.55455866315636}, {"colorCode":"R01", "score":3.65942666383293}, {"colorCode":"RV52", "score":3.73678458430537}, {"colorCode":"RV13", "score":3.79087323477641}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV04.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV04.json deleted file mode 100644 index f910553..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV04.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV04", "rgbString":"f6a3bf", "name":"Shock Pink", "rgb":[246, 163, 191], "cie":[75.7914818599637, 34.4702746453844, -1.65930080007668], "hue":"RV", "saturation":"0", "brightness":"4", "alternatives":[{"colorCode":"R83", "score":2.29693486324652}, {"colorCode":"V05", "score":2.3558959372951}, {"colorCode":"FRV1", "score":2.7611491521899}, {"colorCode":"V15", "score":3.98312744888939}, {"colorCode":"RV14", "score":4.0814896265076}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV06.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV06.json deleted file mode 100644 index 1cb58c5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV06.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV06", "rgbString":"f386af", "name":"Cerise", "rgb":[243, 134, 175], "cie":[68.8959114711198, 46.1947510732919, -2.95367392847898], "hue":"RV", "saturation":"0", "brightness":"6", "alternatives":[{"colorCode":"RV25", "score":3.44095117603203}, {"colorCode":"RV14", "score":3.98849409671239}, {"colorCode":"RV17", "score":4.57941113290711}, {"colorCode":"R35", "score":5.67993439483176}, {"colorCode":"R83", "score":5.7943172517148}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV09.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV09.json deleted file mode 100644 index ea6f8ae..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV09.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV09", "rgbString":"e171ac", "name":"Fuchsia", "rgb":[225, 113, 172], "cie":[62.3353526310119, 50.3140726277068, -11.2559204573055], "hue":"RV", "saturation":"0", "brightness":"9", "alternatives":[{"colorCode":"RV17", "score":2.92206043715574}, {"colorCode":"RV19", "score":3.82762945413337}, {"colorCode":"R85", "score":4.39073701022525}, {"colorCode":"R56", "score":4.57143219907781}, {"colorCode":"V95", "score":6.37290542983155}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV10.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV10.json deleted file mode 100644 index 7dd9cc5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV10.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV10", "rgbString":"fdecf4", "name":"Pale Pink", "rgb":[253, 236, 244], "cie":[94.909927728884, 7.09975821136255, -1.79998940654014], "hue":"RV", "saturation":"1", "brightness":"0", "alternatives":[{"colorCode":"RV0000", "score":1.50642202103719}, {"colorCode":"V0000", "score":2.0452900393727}, {"colorCode":"E50", "score":2.62630432459835}, {"colorCode":"R0000", "score":2.75090975184032}, {"colorCode":"E000", "score":2.86375606602191}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV11.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV11.json deleted file mode 100644 index 717385c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV11.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV11", "rgbString":"fbd6dd", "name":"Pink", "rgb":[251, 214, 221], "cie":[88.838678335894, 13.9786077934683, 1.34176000559838], "hue":"RV", "saturation":"1", "brightness":"1", "alternatives":[{"colorCode":"R01", "score":2.90774194864686}, {"colorCode":"RV91", "score":3.35967646796147}, {"colorCode":"RV02", "score":4.1229545853703}, {"colorCode":"RV000", "score":4.15986287200313}, {"colorCode":"R30", "score":4.34606133835143}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV13.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV13.json deleted file mode 100644 index 24c9493..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV13.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV13", "rgbString":"f9c9d7", "name":"Tender Pink", "rgb":[249, 201, 215], "cie":[85.4126218681284, 19.1323330088604, -0.500166118896672], "hue":"RV", "saturation":"1", "brightness":"3", "alternatives":[{"colorCode":"R81", "score":1.61786266902465}, {"colorCode":"RV52", "score":2.44034636054097}, {"colorCode":"RV32", "score":3.19947334335202}, {"colorCode":"RV02", "score":3.72804338825984}, {"colorCode":"V91", "score":3.76881113691775}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV14.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV14.json deleted file mode 100644 index 8e5de43..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV14.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV14", "rgbString":"f495b7", "name":"Begonia Pink", "rgb":[244, 149, 183], "cie":[72.3265664046757, 39.9474511743734, -2.35961705397971], "hue":"RV", "saturation":"1", "brightness":"4", "alternatives":[{"colorCode":"R83", "score":1.99209990365846}, {"colorCode":"RV25", "score":2.63674313007009}, {"colorCode":"FRV1", "score":3.88274953830594}, {"colorCode":"RV04", "score":3.98391883255876}, {"colorCode":"RV55", "score":4.05773226763844}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV17.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV17.json deleted file mode 100644 index cae0896..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV17", "rgbString":"db7eb3", "name":"Deep Magenta", "rgb":[219, 126, 179], "cie":[64.3519101486891, 42.8069619643333, -12.2917302346842], "hue":"RV", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"RV09", "score":3.08683000214283}, {"colorCode":"R56", "score":3.64079576004909}, {"colorCode":"RV06", "score":4.5812867777223}, {"colorCode":"V06", "score":5.76269555659284}, {"colorCode":"R85", "score":6.08298648457859}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV19.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV19.json deleted file mode 100644 index 672daba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV19.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV19", "rgbString":"d268aa", "name":"Red Violet", "rgb":[210, 104, 170], "cie":[58.5128971567631, 49.6832059653283, -16.0726010556929], "hue":"RV", "saturation":"1", "brightness":"9", "alternatives":[{"colorCode":"RV09", "score":3.82753810123169}, {"colorCode":"V95", "score":5.77788359747758}, {"colorCode":"R56", "score":5.79999702107761}, {"colorCode":"RV17", "score":6.27315322142224}, {"colorCode":"RV66", "score":6.85730173003419}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV21.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV21.json deleted file mode 100644 index 9e83b34..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV21", "rgbString":"fde8e7", "name":"Light Pink", "rgb":[253, 232, 231], "cie":[93.6089713779835, 6.97018975151925, 3.05993270817777], "hue":"RV", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"R30", "score":1.99270620193941}, {"colorCode":"R000", "score":2.120709883847}, {"colorCode":"E50", "score":2.60940198458732}, {"colorCode":"E00", "score":3.07659418822372}, {"colorCode":"W00", "score":3.3247543753812}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV23.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV23.json deleted file mode 100644 index ef7d0a8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV23", "rgbString":"f8bac9", "name":"Pure Pink", "rgb":[248, 186, 201], "cie":[81.4514605267929, 24.5245582654449, 1.20308636177775], "hue":"RV", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"RV93", "score":2.89605594188741}, {"colorCode":"RV34", "score":3.79200012505534}, {"colorCode":"E04", "score":4.5309438596856}, {"colorCode":"RV13", "score":4.72325601351946}, {"colorCode":"R81", "score":4.73820756587274}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV25.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV25.json deleted file mode 100644 index 16cfcee..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV25.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV25", "rgbString":"f493be", "name":"Dog Rose Flower", "rgb":[244, 147, 190], "cie":[72.1068407732653, 41.9652084913786, -6.56434499112601], "hue":"RV", "saturation":"2", "brightness":"5", "alternatives":[{"colorCode":"RV14", "score":2.57327849518529}, {"colorCode":"R83", "score":2.7655293727237}, {"colorCode":"RV06", "score":3.46782931837134}, {"colorCode":"FRV1", "score":4.43766009709328}, {"colorCode":"RV04", "score":4.58931244849962}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV29.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV29.json deleted file mode 100644 index 04b2333..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV29.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV29", "rgbString":"ef4880", "name":"Crimson", "rgb":[239, 72, 128], "cie":[56.6283585711763, 67.2103597587989, 6.1863084262064], "hue":"RV", "saturation":"2", "brightness":"9", "alternatives":[{"colorCode":"R46", "score":2.89061443670845}, {"colorCode":"R85", "score":5.595326451973}, {"colorCode":"R37", "score":5.69850260791497}, {"colorCode":"R29", "score":6.70534577006825}, {"colorCode":"R39", "score":6.86373295337256}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV32.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV32.json deleted file mode 100644 index de16f5a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV32.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV32", "rgbString":"fad3ce", "name":"Shadow Pink", "rgb":[250, 211, 206], "cie":[87.6638573436909, 12.8563047284392, 7.54628809725373], "hue":"RV", "saturation":"3", "brightness":"2", "alternatives":[{"colorCode":"R20", "score":1.18522237619036}, {"colorCode":"YR01", "score":2.887151358341}, {"colorCode":"R02", "score":2.90023527443766}, {"colorCode":"RV13", "score":3.38848391490471}, {"colorCode":"R11", "score":4.15571899322764}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV34.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV34.json deleted file mode 100644 index 4769371..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV34.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV34", "rgbString":"f9afae", "name":"Dark Pink", "rgb":[249, 175, 174], "cie":[78.3775018183963, 26.918148271566, 11.3875513610316], "hue":"RV", "saturation":"3", "brightness":"4", "alternatives":[{"colorCode":"R22", "score":2.31990408263154}, {"colorCode":"RV42", "score":3.6313958459197}, {"colorCode":"RV23", "score":3.67753385074407}, {"colorCode":"R21", "score":5.17019274129713}, {"colorCode":"R32", "score":5.39051886500529}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV42.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV42.json deleted file mode 100644 index 03ed847..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV42.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV42", "rgbString":"f8bbb6", "name":"Salmon Pink", "rgb":[248, 187, 182], "cie":[81.2225661220613, 21.284184336667, 11.0962387462239], "hue":"RV", "saturation":"4", "brightness":"2", "alternatives":[{"colorCode":"R22", "score":1.36812365700158}, {"colorCode":"R21", "score":1.65918396853461}, {"colorCode":"R32", "score":1.84285520582025}, {"colorCode":"E23", "score":3.42497856243572}, {"colorCode":"RV34", "score":3.79517231761816}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV52.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV52.json deleted file mode 100644 index 4e27055..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV52.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV52", "rgbString":"f9cade", "name":"Various Cotton Candy", "rgb":[249, 202, 222], "cie":[85.8335059462814, 19.7333668218088, -3.60722596988452], "hue":"RV", "saturation":"5", "brightness":"2", "alternatives":[{"colorCode":"R81", "score":2.23741144317822}, {"colorCode":"RV13", "score":2.41407732117279}, {"colorCode":"RV02", "score":3.60103555799139}, {"colorCode":"V93", "score":4.08299526842683}, {"colorCode":"R20", "score":4.16984848184447}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV55.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV55.json deleted file mode 100644 index 2938675..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV55.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV55", "rgbString":"e9a5ca", "name":"Hollyhock", "rgb":[233, 165, 202], "cie":[75.1380605898526, 30.5784595571412, -8.81041067201434], "hue":"RV", "saturation":"5", "brightness":"5", "alternatives":[{"colorCode":"V05", "score":1.16414804453808}, {"colorCode":"V04", "score":1.44705052809132}, {"colorCode":"FRV1", "score":1.8007890161517}, {"colorCode":"R83", "score":2.22708884232545}, {"colorCode":"V15", "score":2.83482128019049}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV63.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV63.json deleted file mode 100644 index c0c58dd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV63.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV63", "rgbString":"d09dae", "name":"Begonia", "rgb":[208, 157, 174], "cie":[69.8805335788556, 21.5602172709992, -1.41997633295723], "hue":"RV", "saturation":"6", "brightness":"3", "alternatives":[{"colorCode":"V15", "score":4.23759876896617}, {"colorCode":"V06", "score":5.57416932410922}, {"colorCode":"V05", "score":6.14134428864697}, {"colorCode":"V04", "score":7.2941274707055}, {"colorCode":"RV55", "score":7.38025977230928}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV66.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV66.json deleted file mode 100644 index dcb391d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV66.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV66", "rgbString":"b86a84", "name":"Raspberry", "rgb":[184, 106, 132], "cie":[54.2009589159305, 34.3493303433105, -0.734001642056126], "hue":"RV", "saturation":"6", "brightness":"6", "alternatives":[{"colorCode":"R85", "score":6.10839129458284}, {"colorCode":"R59", "score":7.536140025929}, {"colorCode":"RV95", "score":7.54084426886669}, {"colorCode":"R56", "score":7.743695375515}, {"colorCode":"RV19", "score":8.23439866047933}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV69.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV69.json deleted file mode 100644 index 39a7fa0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV69.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV69", "rgbString":"8b576e", "name":"Peony", "rgb":[139, 87, 110], "cie":[43.4058231934701, 24.9341694548669, -4.10751241843088], "hue":"RV", "saturation":"6", "brightness":"9", "alternatives":[{"colorCode":"E29", "score":7.24663277611753}, {"colorCode":"C7", "score":8.99867576964505}, {"colorCode":"E27", "score":9.57347213178248}, {"colorCode":"C8", "score":9.77390858118629}, {"colorCode":"E49", "score":10.2877805281874}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV91.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV91.json deleted file mode 100644 index f7a696b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV91.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV91", "rgbString":"e6d4e2", "name":"Garyish Cherry", "rgb":[230, 212, 226], "cie":[86.7022102940033, 8.64511597432871, -4.63975540193629], "hue":"RV", "saturation":"9", "brightness":"1", "alternatives":[{"colorCode":"V12", "score":2.4547946698848}, {"colorCode":"RV00", "score":2.91268175623083}, {"colorCode":"B91", "score":3.40813716725411}, {"colorCode":"V20", "score":3.62320364428305}, {"colorCode":"RV11", "score":3.63053779182597}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV93.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV93.json deleted file mode 100644 index b75fef3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV93.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV93", "rgbString":"e7b6cc", "name":"Smokey Purple", "rgb":[231, 182, 204], "cie":[78.9284980404528, 21.1258936532009, -4.30991164935051], "hue":"RV", "saturation":"9", "brightness":"3", "alternatives":[{"colorCode":"RV23", "score":2.94499687321493}, {"colorCode":"V93", "score":3.1486974206772}, {"colorCode":"E04", "score":3.15856076303646}, {"colorCode":"V01", "score":3.26505261577514}, {"colorCode":"V04", "score":4.79277948861315}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV95.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV95.json deleted file mode 100644 index 64986f7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV95.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV95", "rgbString":"b684a1", "name":"Baby Blossoms", "rgb":[182, 132, 161], "cie":[60.7999999600183, 23.8170051277454, -7.81351615790804], "hue":"RV", "saturation":"9", "brightness":"5", "alternatives":[{"colorCode":"V95", "score":4.04525451058464}, {"colorCode":"R56", "score":5.46131102587362}, {"colorCode":"BV08", "score":5.79623055082764}, {"colorCode":"E74", "score":6.5355090663418}, {"colorCode":"E59", "score":7.01612393972738}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/RV99.json b/uml2es/examples/blockFactory/data/blockfactory/color/RV99.json deleted file mode 100644 index e7729b3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/RV99.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"RV99", "rgbString":"5a4858", "name":"Argyle Purple", "rgb":[90, 72, 88], "cie":[32.9472764581244, 10.8062759037343, -6.57582158246759], "hue":"RV", "saturation":"9", "brightness":"9", "alternatives":[{"colorCode":"V99", "score":2.66626913964911}, {"colorCode":"C9", "score":5.58926906842842}, {"colorCode":"C8", "score":7.1010389288143}, {"colorCode":"N9", "score":7.21750476785073}, {"colorCode":"T9", "score":7.28587730138217}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T0.json b/uml2es/examples/blockFactory/data/blockfactory/color/T0.json deleted file mode 100644 index 42e51dc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T0.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T0", "rgbString":"eceeed", "name":"Toner Gray", "rgb":[236, 238, 237], "cie":[93.9246240379962, -0.838943422389438, 0.238789311097132], "hue":"T", "saturation":"0", "brightness":"-", "alternatives":[{"colorCode":"N0", "score":0}, {"colorCode":"T1", "score":1.28524009574823}, {"colorCode":"E70", "score":2.00748362744976}, {"colorCode":"C00", "score":2.23711348175014}, {"colorCode":"BG90", "score":2.6912268390189}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T1.json b/uml2es/examples/blockFactory/data/blockfactory/color/T1.json deleted file mode 100644 index 81f59ad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T1", "rgbString":"eaeae8", "name":"Toner Gray", "rgb":[234, 234, 232], "cie":[92.6473074059278, -0.349407481608333, 0.958661333340705], "hue":"T", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"N0", "score":1.28513975752144}, {"colorCode":"T0", "score":1.28513975752144}, {"colorCode":"E70", "score":1.64857930703935}, {"colorCode":"N1", "score":2.43562496955187}, {"colorCode":"BG90", "score":2.51052403948136}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T10.json b/uml2es/examples/blockFactory/data/blockfactory/color/T10.json deleted file mode 100644 index 8ba9727..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T10.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T10", "rgbString":"322e2d", "name":"Toner Gray", "rgb":[50, 46, 45], "cie":[19.3146164575302, 1.57725631763681, 1.28715098947303], "hue":"T", "saturation":"1", "brightness":"0", "alternatives":[{"colorCode":"N10", "score":0.857013995741885}, {"colorCode":"100", "score":1.4015977688238}, {"colorCode":"W10", "score":2.40263030710124}, {"colorCode":"C10", "score":4.55768727037116}, {"colorCode":"C9", "score":10.6911751561785}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T2.json b/uml2es/examples/blockFactory/data/blockfactory/color/T2.json deleted file mode 100644 index c5684b1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T2", "rgbString":"e0e0de", "name":"Toner Gray", "rgb":[224, 224, 222], "cie":[89.1265102326119, -0.352435764767622, 0.966998968371513], "hue":"T", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"N1", "score":2.33842844622348}, {"colorCode":"N2", "score":2.71269030645439}, {"colorCode":"C1", "score":2.94657430991951}, {"colorCode":"W2", "score":3.22609829363566}, {"colorCode":"C0", "score":3.50988904284371}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T3.json b/uml2es/examples/blockFactory/data/blockfactory/color/T3.json deleted file mode 100644 index 40bd41c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T3.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T3", "rgbString":"d1d2cc", "name":"Toner Gray", "rgb":[209, 210, 204], "cie":[83.9700022504143, -1.41563268860656, 2.83901540712244], "hue":"T", "saturation":"3", "brightness":"-", "alternatives":[{"colorCode":"W3", "score":0.898066014431607}, {"colorCode":"E71", "score":3.0101100293328}, {"colorCode":"C3", "score":3.03293411506125}, {"colorCode":"N2", "score":3.86089170990345}, {"colorCode":"N3", "score":3.94795136600855}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T4.json b/uml2es/examples/blockFactory/data/blockfactory/color/T4.json deleted file mode 100644 index 43d31eb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T4.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T4", "rgbString":"bcbbb9", "name":"Toner Gray", "rgb":[188, 187, 185], "cie":[75.9061917440124, -0.0142865068115117, 1.1250004603877], "hue":"T", "saturation":"4", "brightness":"-", "alternatives":[{"colorCode":"N4", "score":1.24541465431061}, {"colorCode":"W4", "score":2.06426044764592}, {"colorCode":"BG93", "score":3.97838486452325}, {"colorCode":"C4", "score":6.48021684092362}, {"colorCode":"C3", "score":6.6028918248873}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T5.json b/uml2es/examples/blockFactory/data/blockfactory/color/T5.json deleted file mode 100644 index 27e01c0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T5.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T5", "rgbString":"a8a7a3", "name":"Toner Gray", "rgb":[168, 167, 163], "cie":[68.4653404375885, -0.385365538505822, 2.1824973477744], "hue":"T", "saturation":"5", "brightness":"-", "alternatives":[{"colorCode":"W5", "score":0.748902486063013}, {"colorCode":"N5", "score":4.37403092278759}, {"colorCode":"C4", "score":5.88985673456046}, {"colorCode":"C5", "score":6.11563953727353}, {"colorCode":"T6", "score":7.00232717892526}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T6.json b/uml2es/examples/blockFactory/data/blockfactory/color/T6.json deleted file mode 100644 index 9753de5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T6.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T6", "rgbString":"949590", "name":"Toner Gray", "rgb":[148, 149, 144], "cie":[61.4850928513187, -1.31767125392862, 2.50148112698427], "hue":"T", "saturation":"6", "brightness":"-", "alternatives":[{"colorCode":"W6", "score":0.493868275440864}, {"colorCode":"N6", "score":4.84651295128351}, {"colorCode":"C5", "score":5.74266636986929}, {"colorCode":"C6", "score":6.47520594280269}, {"colorCode":"T5", "score":7.00126471197203}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T7.json b/uml2es/examples/blockFactory/data/blockfactory/color/T7.json deleted file mode 100644 index 074e74f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T7.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T7", "rgbString":"777674", "name":"Toner Gray", "rgb":[119, 118, 116], "cie":[49.6651836554797, -0.0149359690796436, 1.2272502099669], "hue":"T", "saturation":"7", "brightness":"-", "alternatives":[{"colorCode":"N7", "score":1.34354916719519}, {"colorCode":"W7", "score":1.71255127954025}, {"colorCode":"C7", "score":6.49024261937782}, {"colorCode":"N8", "score":7.31738672676974}, {"colorCode":"T8", "score":7.71483749623586}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T8.json b/uml2es/examples/blockFactory/data/blockfactory/color/T8.json deleted file mode 100644 index 2fab820..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T8.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T8", "rgbString":"63645f", "name":"Toner Gray", "rgb":[99, 100, 95], "cie":[42.143815859591, -1.41187334058662, 2.69119554105353], "hue":"T", "saturation":"8", "brightness":"-", "alternatives":[{"colorCode":"W8", "score":0}, {"colorCode":"N8", "score":3.98536562382204}, {"colorCode":"C8", "score":4.52932712394797}, {"colorCode":"C7", "score":5.6647501682167}, {"colorCode":"T7", "score":7.68837166942464}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/T9.json b/uml2es/examples/blockFactory/data/blockfactory/color/T9.json deleted file mode 100644 index 5dd2fbf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/T9.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"T9", "rgbString":"4c4b49", "name":"Toner Gray", "rgb":[76, 75, 73], "cie":[31.919769613692, -0.0139265356346174, 1.33068630459373], "hue":"T", "saturation":"9", "brightness":"-", "alternatives":[{"colorCode":"W9", "score":1.84100131266852}, {"colorCode":"N9", "score":2.72798224624946}, {"colorCode":"C9", "score":4.93953274177066}, {"colorCode":"C8", "score":8.65256147680632}, {"colorCode":"T8", "score":10.3503128296078}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V000.json b/uml2es/examples/blockFactory/data/blockfactory/color/V000.json deleted file mode 100644 index 998643d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V000", "rgbString":"e9e5f3", "name":"Pale Heath", "rgb":[233, 229, 243], "cie":[91.6100243680769, 3.88380584617887, -6.31262722772208], "hue":"V", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"BV000", "score":1.32110136761451}, {"colorCode":"BV31", "score":1.32110136761451}, {"colorCode":"BV0000", "score":1.32110136761451}, {"colorCode":"V20", "score":1.9899281249678}, {"colorCode":"RV0000", "score":2.12725938042375}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/V0000.json deleted file mode 100644 index 8118994..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V0000", "rgbString":"f0edf6", "name":"Rose Quartz", "rgb":[240, 237, 246], "cie":[94.2042668670778, 2.6152247825128, -3.99150365185681], "hue":"V", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"RV0000", "score":1.44969183271413}, {"colorCode":"RV10", "score":2.2165461881503}, {"colorCode":"BV0000", "score":2.21843874794916}, {"colorCode":"BV000", "score":2.21843874794916}, {"colorCode":"BV31", "score":2.21843874794916}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V01.json b/uml2es/examples/blockFactory/data/blockfactory/color/V01.json deleted file mode 100644 index 20a620e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V01", "rgbString":"e4c1d9", "name":"Heath", "rgb":[228, 193, 217], "cie":[81.6441190459274, 16.4258566809246, -7.33583298650793], "hue":"V", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"V93", "score":0.563899416758216}, {"colorCode":"V91", "score":1.98534606175684}, {"colorCode":"R81", "score":2.85049099534163}, {"colorCode":"RV93", "score":3.35711112371726}, {"colorCode":"RV13", "score":3.82165419714485}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V04.json b/uml2es/examples/blockFactory/data/blockfactory/color/V04.json deleted file mode 100644 index 463b93d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V04.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V04", "rgbString":"e6aace", "name":"Lilac", "rgb":[230, 170, 206], "cie":[76.0868590868214, 27.5336520554703, -9.61816030187701], "hue":"V", "saturation":"0", "brightness":"4", "alternatives":[{"colorCode":"V05", "score":1.44872888790986}, {"colorCode":"RV55", "score":1.4901676880974}, {"colorCode":"FRV1", "score":2.86925669955154}, {"colorCode":"V15", "score":3.04033543114916}, {"colorCode":"R83", "score":3.76970864111939}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V05.json b/uml2es/examples/blockFactory/data/blockfactory/color/V05.json deleted file mode 100644 index 91b9734..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V05.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V05", "rgbString":"e2a6ca", "name":"Marigold", "rgb":[226, 166, 202], "cie":[74.6387702111606, 27.6343883432636, -9.63168770132949], "hue":"V", "saturation":"0", "brightness":"5", "alternatives":[{"colorCode":"RV55", "score":1.21154655188862}, {"colorCode":"V04", "score":1.44872641545063}, {"colorCode":"V15", "score":1.78360836755339}, {"colorCode":"RV04", "score":2.54051475964628}, {"colorCode":"R83", "score":2.94026426758728}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V06.json b/uml2es/examples/blockFactory/data/blockfactory/color/V06.json deleted file mode 100644 index c3095f5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V06.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V06", "rgbString":"ce95c2", "name":"Lavender", "rgb":[206, 149, 194], "cie":[68.3961024395696, 28.6125008277909, -14.7789448375957], "hue":"V", "saturation":"0", "brightness":"6", "alternatives":[{"colorCode":"RV63", "score":4.57431588103407}, {"colorCode":"RV14", "score":5.06215331753746}, {"colorCode":"R83", "score":5.31818382881889}, {"colorCode":"V15", "score":5.33815743498755}, {"colorCode":"RV25", "score":5.59985339543659}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V09.json b/uml2es/examples/blockFactory/data/blockfactory/color/V09.json deleted file mode 100644 index e63f482..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V09.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V09", "rgbString":"8754a1", "name":"Violet", "rgb":[135, 84, 161], "cie":[44.3256525190983, 35.3497522983447, -33.5142828331837], "hue":"V", "saturation":"0", "brightness":"9", "alternatives":[{"colorCode":"RV69", "score":7.40110238624259}, {"colorCode":"V28", "score":7.7697788836298}, {"colorCode":"FV2", "score":8.54900626466912}, {"colorCode":"B97", "score":8.98356329945943}, {"colorCode":"E47", "score":10.5952326138409}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V12.json b/uml2es/examples/blockFactory/data/blockfactory/color/V12.json deleted file mode 100644 index addd19f..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V12.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V12", "rgbString":"eed7e9", "name":"Pale Lilac", "rgb":[238, 215, 233], "cie":[88.2858862329561, 11.0223602926964, -5.92780738473846], "hue":"V", "saturation":"1", "brightness":"2", "alternatives":[{"colorCode":"RV00", "score":1.12330912465278}, {"colorCode":"RV02", "score":2.29425746894492}, {"colorCode":"RV91", "score":2.34514218636501}, {"colorCode":"V20", "score":3.89951789930977}, {"colorCode":"RV000", "score":4.01578820437003}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V15.json b/uml2es/examples/blockFactory/data/blockfactory/color/V15.json deleted file mode 100644 index b33f925..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V15.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V15", "rgbString":"d3a6cd", "name":"Mallow", "rgb":[211, 166, 205], "cie":[73.2389267852969, 23.0251135911359, -13.5256370509774], "hue":"V", "saturation":"1", "brightness":"5", "alternatives":[{"colorCode":"V05", "score":1.82002700916087}, {"colorCode":"RV55", "score":3.00191479370135}, {"colorCode":"V04", "score":3.0594925246043}, {"colorCode":"RV63", "score":4.0790002668185}, {"colorCode":"RV04", "score":4.36885293279731}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V17.json b/uml2es/examples/blockFactory/data/blockfactory/color/V17.json deleted file mode 100644 index 8452009..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V17", "rgbString":"a092c7", "name":"Amethyst", "rgb":[160, 146, 199], "cie":[63.4706787545324, 16.1257834441888, -25.4703057319419], "hue":"V", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"BV08", "score":6.23729451440753}, {"colorCode":"BV13", "score":6.52055764142769}, {"colorCode":"B66", "score":7.19013647408964}, {"colorCode":"RV63", "score":7.36314809863642}, {"colorCode":"BV17", "score":7.99283848747141}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V20.json b/uml2es/examples/blockFactory/data/blockfactory/color/V20.json deleted file mode 100644 index 0d7e298..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V20.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V20", "rgbString":"e2e0ed", "name":"Wisteria", "rgb":[226, 224, 237], "cie":[89.6707264373233, 3.05496804526789, -6.09404819151256], "hue":"V", "saturation":"2", "brightness":"0", "alternatives":[{"colorCode":"V000", "score":1.99199566979372}, {"colorCode":"BV00", "score":2.03489941705049}, {"colorCode":"B60", "score":2.15526439268742}, {"colorCode":"RV000", "score":2.52682996793104}, {"colorCode":"BV000", "score":2.60271157779087}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V22.json b/uml2es/examples/blockFactory/data/blockfactory/color/V22.json deleted file mode 100644 index 80faa7a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V22.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V22", "rgbString":"b2b1d0", "name":"Sketch Ash Lavender", "rgb":[178, 177, 208], "cie":[73.1959333276481, 6.57723312073405, -15.5209676549412], "hue":"V", "saturation":"2", "brightness":"2", "alternatives":[{"colorCode":"BV02", "score":2.13254012275135}, {"colorCode":"B63", "score":3.24287485183624}, {"colorCode":"BV23", "score":4.25937100290327}, {"colorCode":"BV34", "score":5.50675137322349}, {"colorCode":"B23", "score":5.51905130490395}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V25.json b/uml2es/examples/blockFactory/data/blockfactory/color/V25.json deleted file mode 100644 index 2f52007..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V25.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V25", "rgbString":"857fad", "name":"Pale Blackberry", "rgb":[133, 127, 173], "cie":[55.2597413726165, 12.3703073249568, -23.5338220995871], "hue":"V", "saturation":"2", "brightness":"5", "alternatives":[{"colorCode":"BV25", "score":3.07485303167341}, {"colorCode":"B66", "score":4.34755875197279}, {"colorCode":"BV08", "score":4.67640046823858}, {"colorCode":"V95", "score":4.95939286488606}, {"colorCode":"BV13", "score":6.16136031227556}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V28.json b/uml2es/examples/blockFactory/data/blockfactory/color/V28.json deleted file mode 100644 index 2c28083..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V28.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V28", "rgbString":"6b668e", "name":"Sketch Eggplant", "rgb":[107, 102, 142], "cie":[45.0556344212143, 11.1540164809937, -21.2731198608476], "hue":"V", "saturation":"2", "brightness":"8", "alternatives":[{"colorCode":"C7", "score":8.21080073246144}, {"colorCode":"B39", "score":9.52389557712159}, {"colorCode":"FV2", "score":10.0481858709637}, {"colorCode":"V25", "score":10.2784029175114}, {"colorCode":"C8", "score":10.3316565418388}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V91.json b/uml2es/examples/blockFactory/data/blockfactory/color/V91.json deleted file mode 100644 index 4de8c11..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V91.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V91", "rgbString":"e8c4d0", "name":"Pale Grape", "rgb":[232, 196, 208], "cie":[82.480632144397, 14.6795043900844, -1.23604795756231], "hue":"V", "saturation":"9", "brightness":"1", "alternatives":[{"colorCode":"V01", "score":2.13036234687745}, {"colorCode":"R81", "score":2.28909188610976}, {"colorCode":"V93", "score":2.64348129199102}, {"colorCode":"E04", "score":2.66761467783932}, {"colorCode":"RV13", "score":3.95237539411383}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V93.json b/uml2es/examples/blockFactory/data/blockfactory/color/V93.json deleted file mode 100644 index 16958f5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V93.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V93", "rgbString":"e5c1db", "name":"Early Grape", "rgb":[229, 193, 219], "cie":[81.7905595559478, 17.1201582583964, -8.18214927460068], "hue":"V", "saturation":"9", "brightness":"3", "alternatives":[{"colorCode":"V01", "score":0.551331642761289}, {"colorCode":"V91", "score":2.39073268087758}, {"colorCode":"E04", "score":2.64146351766988}, {"colorCode":"R81", "score":2.88026259516696}, {"colorCode":"RV93", "score":3.18392732981472}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V95.json b/uml2es/examples/blockFactory/data/blockfactory/color/V95.json deleted file mode 100644 index 6c2dd93..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V95.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V95", "rgbString":"b77ca8", "name":"Light Grape", "rgb":[183, 124, 168], "cie":[59.2599324332963, 29.8563982744222, -14.1174550821425], "hue":"V", "saturation":"9", "brightness":"5", "alternatives":[{"colorCode":"RV95", "score":3.55283410083376}, {"colorCode":"V25", "score":4.76540800201447}, {"colorCode":"R85", "score":5.2766545476702}, {"colorCode":"BV25", "score":6.12572277232246}, {"colorCode":"RV17", "score":6.88222390316409}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/V99.json b/uml2es/examples/blockFactory/data/blockfactory/color/V99.json deleted file mode 100644 index bf599db..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/V99.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"V99", "rgbString":"524358", "name":"Aubergine", "rgb":[82, 67, 88], "cie":[30.670843212339, 10.8649652873122, -10.0907798027839], "hue":"V", "saturation":"9", "brightness":"9", "alternatives":[{"colorCode":"RV99", "score":2.62470645416106}, {"colorCode":"C9", "score":5.53055395687577}, {"colorCode":"W9", "score":7.22363421382523}, {"colorCode":"T9", "score":8.19125687575351}, {"colorCode":"N9", "score":8.35157301794992}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W0.json b/uml2es/examples/blockFactory/data/blockfactory/color/W0.json deleted file mode 100644 index 685d6e8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W0.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W0", "rgbString":"ecece4", "name":"Warm Gray", "rgb":[236, 236, 228], "cie":[93.2002811535047, -1.39324914012312, 3.86249856497873], "hue":"W", "saturation":"0", "brightness":"-", "alternatives":[{"colorCode":"E70", "score":1.19952735146465}, {"colorCode":"W1", "score":1.75450042223048}, {"colorCode":"G00", "score":1.85568647348183}, {"colorCode":"BG90", "score":1.91651139453125}, {"colorCode":"W00", "score":2.44454727331315}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W00.json b/uml2es/examples/blockFactory/data/blockfactory/color/W00.json deleted file mode 100644 index 0342e45..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W00", "rgbString":"f3f3eb", "name":"Warm Gray", "rgb":[243, 243, 235], "cie":[95.6447522220037, -1.38605250975637, 3.84078366233267], "hue":"W", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"G0000", "score":1.42174776352059}, {"colorCode":"E000", "score":1.51995981405523}, {"colorCode":"E00", "score":1.63648575584577}, {"colorCode":"G00", "score":2.03714055241749}, {"colorCode":"BG000", "score":2.09316983645226}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W1.json b/uml2es/examples/blockFactory/data/blockfactory/color/W1.json deleted file mode 100644 index 3ecf24b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W1.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W1", "rgbString":"e7e7df", "name":"Warm Gray No. 1", "rgb":[231, 231, 223], "cie":[91.4458380652207, -1.39852401136104, 3.87846032344763], "hue":"W", "saturation":"1", "brightness":"-", "alternatives":[{"colorCode":"W0", "score":1.75450034911224}, {"colorCode":"BG90", "score":1.84332580961965}, {"colorCode":"E70", "score":1.9384560010573}, {"colorCode":"E40", "score":2.75663235205542}, {"colorCode":"N1", "score":2.83133647742603}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W10.json b/uml2es/examples/blockFactory/data/blockfactory/color/W10.json deleted file mode 100644 index 43c2393..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W10.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W10", "rgbString":"302f2b", "name":"Warm Gray", "rgb":[48, 47, 43], "cie":[19.3740311782178, -0.451700739005023, 2.72505028530242], "hue":"W", "saturation":"1", "brightness":"0", "alternatives":[{"colorCode":"T10", "score":2.37410648865877}, {"colorCode":"N10", "score":3.25644944256688}, {"colorCode":"100", "score":3.68660049766155}, {"colorCode":"C10", "score":3.98998589564361}, {"colorCode":"C9", "score":10.4136324126787}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W2.json b/uml2es/examples/blockFactory/data/blockfactory/color/W2.json deleted file mode 100644 index 99bc2b8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W2.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W2", "rgbString":"ddddd5", "name":"Warm Gray", "rgb":[221, 221, 213], "cie":[87.9152071682837, -1.40943016534051, 3.91158848959938], "hue":"W", "saturation":"2", "brightness":"-", "alternatives":[{"colorCode":"N2", "score":2.62348515677938}, {"colorCode":"T2", "score":2.90049368410184}, {"colorCode":"N1", "score":3.45094323152122}, {"colorCode":"W1", "score":3.53075304335182}, {"colorCode":"W3", "score":3.91882807458825}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W3.json b/uml2es/examples/blockFactory/data/blockfactory/color/W3.json deleted file mode 100644 index 8d8d865..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W3.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W3", "rgbString":"d2d2ca", "name":"Warm Gray No. 3", "rgb":[210, 210, 202], "cie":[83.9965271826444, -1.42201662405067, 3.95004084591031], "hue":"W", "saturation":"3", "brightness":"-", "alternatives":[{"colorCode":"T3", "score":0.863227915167896}, {"colorCode":"W2", "score":3.91882762157648}, {"colorCode":"N2", "score":4.26825870853834}, {"colorCode":"N3", "score":4.78826381356173}, {"colorCode":"E71", "score":5.08450443282114}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W4.json b/uml2es/examples/blockFactory/data/blockfactory/color/W4.json deleted file mode 100644 index 74a1009..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W4.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W4", "rgbString":"bcbdb7", "name":"Warm Gray", "rgb":[188, 189, 183], "cie":[76.378467545825, -1.44310933693798, 2.896779481919], "hue":"W", "saturation":"4", "brightness":"-", "alternatives":[{"colorCode":"BG93", "score":1.83060689408762}, {"colorCode":"T4", "score":1.90241633746489}, {"colorCode":"C4", "score":5.03192523481255}, {"colorCode":"N4", "score":5.11124522429598}, {"colorCode":"C3", "score":5.23897934707431}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W5.json b/uml2es/examples/blockFactory/data/blockfactory/color/W5.json deleted file mode 100644 index ae66de0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W5.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W5", "rgbString":"a8a9a4", "name":"Warm Gray No. 5", "rgb":[168, 169, 164], "cie":[69.0264291866147, -1.28815629265877, 2.44292698523745], "hue":"W", "saturation":"5", "brightness":"-", "alternatives":[{"colorCode":"T5", "score":0.741773982546567}, {"colorCode":"N5", "score":4.73995584839276}, {"colorCode":"C4", "score":5.08391896555934}, {"colorCode":"C5", "score":5.97689710060952}, {"colorCode":"T4", "score":7.0320910492417}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W6.json b/uml2es/examples/blockFactory/data/blockfactory/color/W6.json deleted file mode 100644 index e54a6df..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W6.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W6", "rgbString":"94958f", "name":"Warm Gray", "rgb":[148, 149, 143], "cie":[61.458699159934, -1.50568741080243, 3.02969351918534], "hue":"W", "saturation":"6", "brightness":"-", "alternatives":[{"colorCode":"T6", "score":0.483177107922861}, {"colorCode":"C5", "score":5.32472094466213}, {"colorCode":"N6", "score":5.32902732870652}, {"colorCode":"C6", "score":6.02457437985574}, {"colorCode":"T5", "score":7.07945757584006}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W7.json b/uml2es/examples/blockFactory/data/blockfactory/color/W7.json deleted file mode 100644 index 68c0132..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W7.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W7", "rgbString":"777873", "name":"Warm Gray No. 7", "rgb":[119, 120, 115], "cie":[50.2072208205915, -1.36873599158405, 2.60372919539531], "hue":"W", "saturation":"7", "brightness":"-", "alternatives":[{"colorCode":"T7", "score":1.60795599388881}, {"colorCode":"N7", "score":5.03219410152418}, {"colorCode":"C7", "score":5.293379052715}, {"colorCode":"N8", "score":7.99635219226917}, {"colorCode":"W8", "score":8.06386460018139}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W8.json b/uml2es/examples/blockFactory/data/blockfactory/color/W8.json deleted file mode 100644 index e3071cb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W8.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W8", "rgbString":"63645f", "name":"Warm Gray", "rgb":[99, 100, 95], "cie":[42.143815859591, -1.41187334058662, 2.69119554105353], "hue":"W", "saturation":"8", "brightness":"-", "alternatives":[{"colorCode":"T8", "score":0}, {"colorCode":"N8", "score":3.98536562382204}, {"colorCode":"C8", "score":4.52932712394797}, {"colorCode":"C7", "score":5.6647501682167}, {"colorCode":"T7", "score":7.68837166942464}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/W9.json b/uml2es/examples/blockFactory/data/blockfactory/color/W9.json deleted file mode 100644 index 8c6645c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/W9.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"W9", "rgbString":"4c4d48", "name":"Warm Gray", "rgb":[76, 77, 72], "cie":[32.507179999843, -1.47340634533491, 2.81808131807775], "hue":"W", "saturation":"9", "brightness":"-", "alternatives":[{"colorCode":"T9", "score":1.72109987444272}, {"colorCode":"C9", "score":3.86924145508354}, {"colorCode":"N9", "score":4.15867581573787}, {"colorCode":"C8", "score":7.1304527308517}, {"colorCode":"E89", "score":8.68817040616139}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y00.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y00.json deleted file mode 100644 index 1fd4ee0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y00", "rgbString":"fefddf", "name":"Barium Yellow", "rgb":[254, 253, 223], "cie":[98.6895719736561, -4.60710129403091, 14.4860349617431], "hue":"Y", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"YG0000", "score":3.08552843668454}, {"colorCode":"YR30", "score":3.1246464221111}, {"colorCode":"G20", "score":3.15478500658329}, {"colorCode":"Y000", "score":3.27329543089233}, {"colorCode":"E30", "score":4.09353033160469}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y000.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y000.json deleted file mode 100644 index 435f23b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y000", "rgbString":"fffce9", "name":"Pale Lemon", "rgb":[255, 252, 233], "cie":[98.7350015796035, -2.18361672189232, 9.43989560832508], "hue":"Y", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"YR0000", "score":2.49776354570689}, {"colorCode":"YG0000", "score":2.85449004644979}, {"colorCode":"E41", "score":2.98535580170863}, {"colorCode":"Y0000", "score":3.29163116710354}, {"colorCode":"E00", "score":3.58209845087655}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y0000.json deleted file mode 100644 index a201785..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y0000", "rgbString":"fefef4", "name":"Yellow Fluorite", "rgb":[254, 254, 244], "cie":[99.4116486804344, -1.71373339798953, 4.76445040614522], "hue":"Y", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"E0000", "score":1.5631751894946}, {"colorCode":"BG0000", "score":2.72858440757476}, {"colorCode":"R0000", "score":2.88437511086217}, {"colorCode":"E00", "score":3.09386926045277}, {"colorCode":"G0000", "score":3.21672779884673}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y02.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y02.json deleted file mode 100644 index a9b3f9e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y02", "rgbString":"f6f396", "name":"Canary Yellow", "rgb":[246, 243, 150], "cie":[94.2678756278798, -12.104166594143, 45.1656196403308], "hue":"Y", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"FY1", "score":1.51703855246643}, {"colorCode":"YG23", "score":3.38713162121355}, {"colorCode":"Y13", "score":3.6358831464385}, {"colorCode":"YG00", "score":5.49473533084189}, {"colorCode":"YR12", "score":5.51374536565614}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y04.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y04.json deleted file mode 100644 index 3c85029..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y04.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y04", "rgbString":"ede556", "name":"Acacia", "rgb":[237, 229, 86], "cie":[89.2593428509149, -14.0389714538446, 68.1352955858349], "hue":"Y", "saturation":"0", "brightness":"4", "alternatives":[{"colorCode":"Y26", "score":2.92120940624311}, {"colorCode":"Y15", "score":3.11713355163465}, {"colorCode":"Y19", "score":3.49195595629647}, {"colorCode":"Y18", "score":3.56661559013441}, {"colorCode":"Y17", "score":4.14338423649285}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y06.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y06.json deleted file mode 100644 index 3981e1d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y06.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y06", "rgbString":"fef56c", "name":"Yellow", "rgb":[254, 245, 108], "cie":[94.9324042094179, -13.6023348958019, 65.5336611396783], "hue":"Y", "saturation":"0", "brightness":"6", "alternatives":[{"colorCode":"Y18", "score":2.74577930542564}, {"colorCode":"Y15", "score":3.24090059835609}, {"colorCode":"Y17", "score":4.51796001010385}, {"colorCode":"Y19", "score":4.66150572530477}, {"colorCode":"FY1", "score":4.84614107155534}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y08.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y08.json deleted file mode 100644 index a13a3f7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y08.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y08", "rgbString":"fef200", "name":"Acid Yellow", "rgb":[254, 242, 0], "cie":[93.6997106723555, -15.7347518079846, 91.9424762249713], "hue":"Y", "saturation":"0", "brightness":"8", "alternatives":[{"colorCode":"Y19", "score":3.2644003509776}, {"colorCode":"Y18", "score":3.95724518156651}, {"colorCode":"Y06", "score":5.21715697241413}, {"colorCode":"Y17", "score":5.41109718197013}, {"colorCode":"Y15", "score":6.18048544254548}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y11.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y11.json deleted file mode 100644 index 3403607..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y11.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y11", "rgbString":"fffbcc", "name":"Pale Yellow", "rgb":[255, 251, 204], "cie":[97.8788608869668, -6.06330587521836, 23.0551519990115], "hue":"Y", "saturation":"1", "brightness":"1", "alternatives":[{"colorCode":"YG21", "score":3.06807509312678}, {"colorCode":"Y21", "score":3.44235842134794}, {"colorCode":"Y00", "score":4.24556829368388}, {"colorCode":"G20", "score":5.18885004415074}, {"colorCode":"YR30", "score":5.60164167968182}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y13.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y13.json deleted file mode 100644 index aaf76b7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y13.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y13", "rgbString":"fbf7ae", "name":"Lemon Yellow", "rgb":[251, 247, 174], "cie":[96.0327415368465, -9.47197000353589, 35.6551253145189], "hue":"Y", "saturation":"1", "brightness":"3", "alternatives":[{"colorCode":"YG21", "score":3.19887807635307}, {"colorCode":"FY1", "score":4.0979553095323}, {"colorCode":"Y02", "score":4.10788598791457}, {"colorCode":"Y11", "score":5.24258520320646}, {"colorCode":"YR12", "score":5.26920252323918}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y15.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y15.json deleted file mode 100644 index 5b4462d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y15.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y15", "rgbString":"fee96c", "name":"Cadmium Yellow", "rgb":[254, 233, 108], "cie":[91.8780628818867, -7.68662090668842, 62.1088821600552], "hue":"Y", "saturation":"1", "brightness":"5", "alternatives":[{"colorCode":"Y17", "score":2.50300836748628}, {"colorCode":"Y18", "score":2.94555042612234}, {"colorCode":"Y04", "score":3.19480375038962}, {"colorCode":"Y06", "score":3.25989934731195}, {"colorCode":"YG23", "score":4.32055844083317}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y17.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y17.json deleted file mode 100644 index 231173a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y17", "rgbString":"ffe455", "name":"Golden Yellow", "rgb":[255, 228, 85], "cie":[90.506633940319, -6.21112105170063, 70.2994954676604], "hue":"Y", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"Y18", "score":2.29817337203677}, {"colorCode":"Y15", "score":2.35425305148896}, {"colorCode":"Y19", "score":2.55386326503185}, {"colorCode":"Y26", "score":3.91532547132661}, {"colorCode":"Y04", "score":4.11570302442279}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y18.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y18.json deleted file mode 100644 index 61427ac..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y18.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y18", "rgbString":"feed55", "name":"Lightning Yellow", "rgb":[254, 237, 85], "cie":[92.7049403399929, -11.0868983474289, 72.5291125999919], "hue":"Y", "saturation":"1", "brightness":"8", "alternatives":[{"colorCode":"Y19", "score":1.90423347784868}, {"colorCode":"Y17", "score":2.29253051492914}, {"colorCode":"Y15", "score":2.6408278801106}, {"colorCode":"Y06", "score":2.68395840887765}, {"colorCode":"Y04", "score":3.557321431401}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y19.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y19.json deleted file mode 100644 index 32d43de..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y19.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y19", "rgbString":"ffe93e", "name":"Napoli Yellow", "rgb":[255, 233, 62], "cie":[91.6335189823052, -9.73569365701732, 79.549909689223], "hue":"Y", "saturation":"1", "brightness":"9", "alternatives":[{"colorCode":"Y18", "score":1.81908553750046}, {"colorCode":"Y17", "score":2.36348202447077}, {"colorCode":"Y04", "score":3.3028406113801}, {"colorCode":"Y08", "score":3.52146320133807}, {"colorCode":"Y15", "score":3.82003395573817}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y21.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y21.json deleted file mode 100644 index b382633..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y21", "rgbString":"ffeec2", "name":"Buttercup Yellow", "rgb":[255, 238, 194], "cie":[94.4422266861412, -0.925164802773215, 23.4095365152052], "hue":"Y", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"YG21", "score":2.75739681103876}, {"colorCode":"YG11", "score":3.38674922781436}, {"colorCode":"Y11", "score":3.44246194970459}, {"colorCode":"YR20", "score":3.4561496531047}, {"colorCode":"Y23", "score":3.66279589009269}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y23.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y23.json deleted file mode 100644 index 7c25f14..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y23", "rgbString":"fbe3b3", "name":"Yellowish Beige", "rgb":[251, 227, 179], "cie":[91.099319953048, 1.20123469883926, 26.4758158809372], "hue":"Y", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"YR21", "score":2.19412725025452}, {"colorCode":"YR31", "score":2.30731129250217}, {"colorCode":"YR12", "score":2.99114074022408}, {"colorCode":"E55", "score":3.08577538176098}, {"colorCode":"E81", "score":3.45989386835671}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y26.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y26.json deleted file mode 100644 index 57d4caf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y26.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y26", "rgbString":"f0dd67", "name":"Mustard", "rgb":[240, 221, 103], "cie":[87.590542992212, -7.71904046945515, 59.1618030605274], "hue":"Y", "saturation":"2", "brightness":"6", "alternatives":[{"colorCode":"Y04", "score":3.16354704076527}, {"colorCode":"YR24", "score":3.69248742183245}, {"colorCode":"Y17", "score":4.155711813867}, {"colorCode":"Y15", "score":4.36010971532823}, {"colorCode":"YR14", "score":4.54168691706917}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y28.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y28.json deleted file mode 100644 index e2e71f2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y28.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y28", "rgbString":"caa869", "name":"Lionet Gold", "rgb":[202, 168, 105], "cie":[70.5815878059957, 4.3166811707383, 37.0585707442514], "hue":"Y", "saturation":"2", "brightness":"8", "alternatives":[{"colorCode":"E37", "score":5.98708245998631}, {"colorCode":"G94", "score":7.90963530330664}, {"colorCode":"YG63", "score":7.96297904866931}, {"colorCode":"E25", "score":8.21301583296376}, {"colorCode":"G85", "score":8.25887484936131}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y32.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y32.json deleted file mode 100644 index 76b9e6c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y32.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y32", "rgbString":"f9dec0", "name":"Cashmere", "rgb":[249, 222, 192], "cie":[89.9465847481787, 4.76013969023698, 18.1191939267098], "hue":"Y", "saturation":"3", "brightness":"2", "alternatives":[{"colorCode":"E21", "score":1.64536060892384}, {"colorCode":"YR20", "score":1.77951569095779}, {"colorCode":"YR00", "score":1.80524304915931}, {"colorCode":"E43", "score":2.88242103796127}, {"colorCode":"YR02", "score":2.95238064448853}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y35.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y35.json deleted file mode 100644 index 8d39bdf..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y35.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y35", "rgbString":"ffd879", "name":"Maize", "rgb":[255, 216, 121], "cie":[87.8491826230491, 2.28282545548419, 51.4311553229033], "hue":"Y", "saturation":"3", "brightness":"5", "alternatives":[{"colorCode":"Y38", "score":1.32458889009879}, {"colorCode":"YR24", "score":4.12745888193021}, {"colorCode":"YG00", "score":4.83858983504081}, {"colorCode":"Y15", "score":5.2377749922611}, {"colorCode":"YR04", "score":5.45380001258958}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/Y38.json b/uml2es/examples/blockFactory/data/blockfactory/color/Y38.json deleted file mode 100644 index f7ea3da..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/Y38.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"Y38", "rgbString":"ffd374", "name":"Honey", "rgb":[255, 211, 116], "cie":[86.5582359970622, 4.44214645955249, 52.2772464967844], "hue":"Y", "saturation":"3", "brightness":"8", "alternatives":[{"colorCode":"Y35", "score":1.32371930120295}, {"colorCode":"YR24", "score":2.81665548699595}, {"colorCode":"YR04", "score":4.13612199058801}, {"colorCode":"YR23", "score":5.06771939358191}, {"colorCode":"YR14", "score":5.15242316650648}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG00.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG00.json deleted file mode 100644 index 496addb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG00", "rgbString":"e6e69e", "name":"Mimosa Yellow", "rgb":[230, 230, 158], "cie":[89.8060341124787, -10.8473907226487, 35.1698842769043], "hue":"YG", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"YG03", "score":1.54647841128311}, {"colorCode":"YG05", "score":2.77174953806718}, {"colorCode":"YG01", "score":3.09627083932661}, {"colorCode":"YG23", "score":3.81931365710482}, {"colorCode":"Y23", "score":4.08827647693375}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG0000.json deleted file mode 100644 index 93a49fd..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG0000", "rgbString":"f2f7e0", "name":"Lily White", "rgb":[242, 247, 224], "cie":[96.3196289681069, -5.58339052690304, 10.4789822441632], "hue":"YG", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"G20", "score":1.67161551755618}, {"colorCode":"E30", "score":1.9357820757801}, {"colorCode":"G40", "score":2.72821025587146}, {"colorCode":"Y000", "score":2.80376366030116}, {"colorCode":"Y00", "score":3.21241462063294}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG01.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG01.json deleted file mode 100644 index 108401e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG01", "rgbString":"e2ebb2", "name":"Green Bice", "rgb":[226, 235, 178], "cie":[91.1436154250139, -12.2181493721559, 26.7270385195274], "hue":"YG", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"YG03", "score":1.73068458198595}, {"colorCode":"G43", "score":2.52916719279615}, {"colorCode":"YG00", "score":3.46256432630253}, {"colorCode":"E55", "score":4.06420652226291}, {"colorCode":"Y21", "score":4.17919142688275}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG03.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG03.json deleted file mode 100644 index dd53aeb..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG03.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG03", "rgbString":"deeaaa", "name":"Yellow Green", "rgb":[222, 234, 170], "cie":[90.449191296984, -14.281393359826, 29.826204430351], "hue":"YG", "saturation":"0", "brightness":"3", "alternatives":[{"colorCode":"G43", "score":1.32705502528953}, {"colorCode":"YG00", "score":1.63337041632754}, {"colorCode":"YG01", "score":1.63454623768629}, {"colorCode":"YG13", "score":2.61643620204249}, {"colorCode":"YG05", "score":4.50777652014107}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG05.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG05.json deleted file mode 100644 index 4c0b498..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG05.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG05", "rgbString":"d6e592", "name":"Salad", "rgb":[214, 229, 146], "cie":[88.1656063133933, -17.8453100515474, 38.8353288131086], "hue":"YG", "saturation":"0", "brightness":"5", "alternatives":[{"colorCode":"YG13", "score":2.13288665995383}, {"colorCode":"YG00", "score":2.61002886037558}, {"colorCode":"YG06", "score":2.9306980734921}, {"colorCode":"YG23", "score":3.01093677784574}, {"colorCode":"G43", "score":3.49239314354666}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG06.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG06.json deleted file mode 100644 index 9c8da7e..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG06.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG06", "rgbString":"c4df92", "name":"Yellowish Green", "rgb":[196, 223, 146], "cie":[85.2946674361096, -21.6294689478066, 34.8516349616196], "hue":"YG", "saturation":"0", "brightness":"6", "alternatives":[{"colorCode":"YG05", "score":2.93395993636675}, {"colorCode":"G03", "score":2.95330743858397}, {"colorCode":"YG13", "score":3.33365952668403}, {"colorCode":"YG25", "score":4.0217037224598}, {"colorCode":"YG00", "score":4.74808495813653}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG07.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG07.json deleted file mode 100644 index a3417be..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG07.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG07", "rgbString":"a5cf4f", "name":"Acid Green", "rgb":[165, 207, 79], "cie":[77.9867444236649, -32.8054793888312, 57.4031998544168], "hue":"YG", "saturation":"0", "brightness":"7", "alternatives":[{"colorCode":"FYG1", "score":1.56699458714691}, {"colorCode":"FYG2", "score":1.56699458714691}, {"colorCode":"YG09", "score":5.29481781671012}, {"colorCode":"G09", "score":5.80226984577592}, {"colorCode":"G07", "score":6.18448589642414}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG09.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG09.json deleted file mode 100644 index ef1e500..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG09.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG09", "rgbString":"82c566", "name":"Lettuce Green", "rgb":[130, 197, 102], "cie":[73.3097861892288, -38.6839224875343, 40.8348723424901], "hue":"YG", "saturation":"0", "brightness":"9", "alternatives":[{"colorCode":"G09", "score":0.800665557359037}, {"colorCode":"YG17", "score":3.00259290092521}, {"colorCode":"G05", "score":3.09307056665821}, {"colorCode":"G07", "score":3.67389564305938}, {"colorCode":"FYG1", "score":5.39783602150379}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG11.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG11.json deleted file mode 100644 index 3930ad6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG11.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG11", "rgbString":"e5f0d0", "name":"Mignonette", "rgb":[229, 240, 208], "cie":[93.2469682127703, -9.14523912794324, 14.2334805357764], "hue":"YG", "saturation":"1", "brightness":"1", "alternatives":[{"colorCode":"E30", "score":2.41687948425254}, {"colorCode":"E31", "score":2.66870252095052}, {"colorCode":"YG41", "score":2.73758001738247}, {"colorCode":"G20", "score":2.81342718958738}, {"colorCode":"YR30", "score":3.41379863716492}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG13.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG13.json deleted file mode 100644 index b7359f3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG13.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG13", "rgbString":"d4e59f", "name":"Chartreuse", "rgb":[212, 229, 159], "cie":[88.2273255519519, -16.9599616763895, 32.3281080214172], "hue":"YG", "saturation":"1", "brightness":"3", "alternatives":[{"colorCode":"G43", "score":1.62588731009846}, {"colorCode":"YG05", "score":2.35905010383847}, {"colorCode":"YG03", "score":2.57464218492045}, {"colorCode":"YG06", "score":3.39324930800842}, {"colorCode":"YG01", "score":3.97011265586123}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG17.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG17.json deleted file mode 100644 index 6bf9d71..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG17.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG17", "rgbString":"72c156", "name":"Grass Green", "rgb":[114, 193, 86], "cie":[71.138444478872, -44.1400010346377, 45.749979058784], "hue":"YG", "saturation":"1", "brightness":"7", "alternatives":[{"colorCode":"G09", "score":2.13665539517218}, {"colorCode":"YG09", "score":2.88317247543445}, {"colorCode":"G07", "score":3.93435374521902}, {"colorCode":"FYG1", "score":6.02083739712}, {"colorCode":"FYG2", "score":6.02083739712}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG21.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG21.json deleted file mode 100644 index 8b09050..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG21", "rgbString":"f7f6be", "name":"Anise", "rgb":[247, 246, 190], "cie":[95.748747040664, -8.39773123359122, 27.1467510437136], "hue":"YG", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"Y21", "score":2.54927831014083}, {"colorCode":"Y11", "score":2.92772084227359}, {"colorCode":"Y13", "score":3.73038750091687}, {"colorCode":"YG01", "score":4.62481995085103}, {"colorCode":"Y23", "score":4.72460486688352}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG23.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG23.json deleted file mode 100644 index 8bd1695..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG23", "rgbString":"e6eb8f", "name":"New Leaf", "rgb":[230, 235, 143], "cie":[90.8814876160342, -15.0457418188799, 44.0399307267342], "hue":"YG", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"YG05", "score":2.9806278994014}, {"colorCode":"YG00", "score":3.32470286722256}, {"colorCode":"Y02", "score":3.38713639324601}, {"colorCode":"YG13", "score":4.19006637739314}, {"colorCode":"YG03", "score":4.37466288190631}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG25.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG25.json deleted file mode 100644 index 018d314..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG25.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG25", "rgbString":"d0e17b", "name":"Celadon Green", "rgb":[208, 225, 123], "cie":[86.3505007505175, -20.7239315392971, 47.7589191691412], "hue":"YG", "saturation":"2", "brightness":"5", "alternatives":[{"colorCode":"YG05", "score":3.32745643211819}, {"colorCode":"YG06", "score":3.46832708779469}, {"colorCode":"YG23", "score":4.82276218086462}, {"colorCode":"YR23", "score":4.88530905693454}, {"colorCode":"YG13", "score":5.01747077408267}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG41.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG41.json deleted file mode 100644 index 1af1c3c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG41.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG41", "rgbString":"d5ebd4", "name":"Pale Cobalt Green", "rgb":[213, 235, 212], "cie":[90.924026678429, -11.4358150444205, 8.69654706153344], "hue":"YG", "saturation":"4", "brightness":"1", "alternatives":[{"colorCode":"G02", "score":1.21642616008489}, {"colorCode":"YG61", "score":1.46818219004214}, {"colorCode":"YG11", "score":2.79234193584399}, {"colorCode":"G21", "score":3.44589882096261}, {"colorCode":"E42", "score":3.68443571205997}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG45.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG45.json deleted file mode 100644 index 1028df7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG45.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG45", "rgbString":"b4dcb7", "name":"Cobalt Green", "rgb":[180, 220, 183], "cie":[84.1261835642951, -20.1310261685799, 13.9110673677788], "hue":"YG", "saturation":"4", "brightness":"5", "alternatives":[{"colorCode":"G24", "score":2.03351417949803}, {"colorCode":"G82", "score":3.25505194023428}, {"colorCode":"G03", "score":5.18265144608227}, {"colorCode":"G21", "score":5.19678790255605}, {"colorCode":"E43", "score":5.23468580952807}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG61.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG61.json deleted file mode 100644 index 9d0d736..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG61.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG61", "rgbString":"d6e9d6", "name":"Pale Moss", "rgb":[214, 233, 214], "cie":[90.5187073755035, -9.74192579003685, 7.08095791765748], "hue":"YG", "saturation":"6", "brightness":"1", "alternatives":[{"colorCode":"YG41", "score":1.56037067499265}, {"colorCode":"G02", "score":1.61996311617364}, {"colorCode":"BG23", "score":2.99066807866757}, {"colorCode":"G40", "score":3.4205728715299}, {"colorCode":"E40", "score":3.71985486721536}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG63.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG63.json deleted file mode 100644 index 80678c6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG63.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG63", "rgbString":"a0caa2", "name":"Pea Green", "rgb":[160, 202, 162], "cie":[77.4737435056677, -21.645410676107, 15.5030829981337], "hue":"YG", "saturation":"6", "brightness":"3", "alternatives":[{"colorCode":"G85", "score":3.76315590610026}, {"colorCode":"G14", "score":5.92679430079064}, {"colorCode":"BG15", "score":6.15177549060101}, {"colorCode":"YG45", "score":6.72427354456733}, {"colorCode":"G03", "score":6.89925975854923}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG67.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG67.json deleted file mode 100644 index b8ce207..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG67.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG67", "rgbString":"81bf8c", "name":"Moss", "rgb":[129, 191, 140], "cie":[72.1094822378602, -30.4399262783184, 19.5520158712312], "hue":"YG", "saturation":"6", "brightness":"7", "alternatives":[{"colorCode":"G05", "score":5.06269492690545}, {"colorCode":"G07", "score":5.59518175999182}, {"colorCode":"G14", "score":6.03648188697461}, {"colorCode":"YG63", "score":6.48003572993139}, {"colorCode":"G16", "score":6.7924394027877}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG91.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG91.json deleted file mode 100644 index 5e5f47d..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG91.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG91", "rgbString":"dad7ae", "name":"Putty", "rgb":[218, 215, 174], "cie":[85.2824242224746, -5.61908937280531, 20.6494694408028], "hue":"YG", "saturation":"9", "brightness":"1", "alternatives":[{"colorCode":"E43", "score":3.51166471686798}, {"colorCode":"E55", "score":4.10924617757442}, {"colorCode":"YG93", "score":4.13388209513169}, {"colorCode":"YR21", "score":4.13960016596741}, {"colorCode":"Y32", "score":4.8579105921177}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG93.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG93.json deleted file mode 100644 index 2c61b57..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG93.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG93", "rgbString":"d2d29c", "name":"Grayish Yellow", "rgb":[210, 210, 156], "cie":[83.0170775591964, -8.56728857131822, 26.8548162872884], "hue":"YG", "saturation":"9", "brightness":"3", "alternatives":[{"colorCode":"YG91", "score":3.75308316210348}, {"colorCode":"YR23", "score":4.25798250661036}, {"colorCode":"E33", "score":4.25994200404973}, {"colorCode":"G82", "score":4.99442267623032}, {"colorCode":"YG06", "score":6.09701112587108}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG95.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG95.json deleted file mode 100644 index 4f1d2f1..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG95.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG95", "rgbString":"cbc65e", "name":"Pale Olive", "rgb":[203, 198, 94], "cie":[78.3992005916775, -11.9459695706794, 51.9380903857115], "hue":"YG", "saturation":"9", "brightness":"5", "alternatives":[{"colorCode":"FYG1", "score":5.29566280793523}, {"colorCode":"FYG2", "score":5.29566280793523}, {"colorCode":"YR24", "score":5.67979235374133}, {"colorCode":"YR14", "score":6.27679996593613}, {"colorCode":"YR82", "score":6.80590287390479}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG97.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG97.json deleted file mode 100644 index 003b8e2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG97.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG97", "rgbString":"958f03", "name":"Spanish Olive", "rgb":[149, 143, 3], "cie":[58.0760002178418, -11.2165436952428, 61.5611657719163], "hue":"YG", "saturation":"9", "brightness":"7", "alternatives":[{"colorCode":"E57", "score":7.85552237180241}, {"colorCode":"E37", "score":8.69609009555044}, {"colorCode":"G99", "score":10.6953478804619}, {"colorCode":"BG99", "score":11.2733601389842}, {"colorCode":"E59", "score":12.5252635790998}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YG99.json b/uml2es/examples/blockFactory/data/blockfactory/color/YG99.json deleted file mode 100644 index 0dc7f9a..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YG99.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YG99", "rgbString":"4e6a15", "name":"Marine Green", "rgb":[78, 106, 21], "cie":[41.187358474151, -23.505731545458, 41.1703001854236], "hue":"YG", "saturation":"9", "brightness":"9", "alternatives":[{"colorCode":"G99", "score":8.1964602312251}, {"colorCode":"E77", "score":9.60329143669886}, {"colorCode":"BG78", "score":10.8026074293362}, {"colorCode":"E87", "score":10.8656119928685}, {"colorCode":"E47", "score":12.0201665418585}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR00.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR00.json deleted file mode 100644 index d8c5bcc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR00.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR00", "rgbString":"fed6bd", "name":"Powder Pink", "rgb":[254, 214, 189], "cie":[88.3704370763441, 10.3199495939009, 17.5462988052531], "hue":"YR", "saturation":"0", "brightness":"0", "alternatives":[{"colorCode":"E93", "score":1.26266256044635}, {"colorCode":"R12", "score":1.29163022493936}, {"colorCode":"YR01", "score":1.37641240322558}, {"colorCode":"YR61", "score":1.73284680055905}, {"colorCode":"Y32", "score":1.78913419352179}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR000.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR000.json deleted file mode 100644 index 7a724f0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR000", "rgbString":"feecd8", "name":"Silk", "rgb":[254, 236, 216], "cie":[94.3207321232434, 2.89834575959497, 11.8828568513337], "hue":"YR", "saturation":"0", "brightness":"00", "alternatives":[{"colorCode":"E51", "score":0.571772247879946}, {"colorCode":"E11", "score":0.801745240551443}, {"colorCode":"YR30", "score":1.60785153745319}, {"colorCode":"E02", "score":2.08929731550191}, {"colorCode":"E41", "score":2.30160727416148}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR0000.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR0000.json deleted file mode 100644 index 302a151..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR0000.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR0000", "rgbString":"fff3e5", "name":"Pale Chiffon", "rgb":[255, 243, 229], "cie":[96.417590360931, 1.71768359404251, 8.17238528255042], "hue":"YR", "saturation":"00", "brightness":"00", "alternatives":[{"colorCode":"E41", "score":1.03248598525976}, {"colorCode":"R000", "score":1.34898113783647}, {"colorCode":"E00", "score":1.8439961473549}, {"colorCode":"E02", "score":1.97386379418402}, {"colorCode":"Y000", "score":2.51326682331575}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR01.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR01.json deleted file mode 100644 index 6728d0b..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR01.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR01", "rgbString":"fedac2", "name":"Peach Puff", "rgb":[254, 218, 194], "cie":[89.4438768824867, 8.93483638638137, 16.433588487521], "hue":"YR", "saturation":"0", "brightness":"1", "alternatives":[{"colorCode":"YR61", "score":0.557076883835944}, {"colorCode":"YR02", "score":0.928987427091644}, {"colorCode":"YR00", "score":1.39842458426136}, {"colorCode":"E21", "score":2.10087778719507}, {"colorCode":"YR20", "score":2.16755978344993}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR02.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR02.json deleted file mode 100644 index 7b716cc..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR02.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR02", "rgbString":"fcdcc5", "name":"Light Orange", "rgb":[252, 220, 197], "cie":[89.818961593653, 7.59158377904845, 15.3672670246225], "hue":"YR", "saturation":"0", "brightness":"2", "alternatives":[{"colorCode":"YR61", "score":0.520566560506426}, {"colorCode":"YR01", "score":0.960004531917546}, {"colorCode":"YR00", "score":2.32264835552468}, {"colorCode":"R12", "score":2.38528238285495}, {"colorCode":"YR20", "score":2.61758037539636}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR04.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR04.json deleted file mode 100644 index 37605b9..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR04.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR04", "rgbString":"fec369", "name":"Chrome Orange", "rgb":[254, 195, 105], "cie":[82.4437291254638, 11.4811345650785, 52.6476385573933], "hue":"YR", "saturation":"0", "brightness":"4", "alternatives":[{"colorCode":"E95", "score":3.48918588864018}, {"colorCode":"YR14", "score":3.71134904964627}, {"colorCode":"Y38", "score":4.13532531095356}, {"colorCode":"YR82", "score":4.72307583590102}, {"colorCode":"YR15", "score":4.73938904682723}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR07.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR07.json deleted file mode 100644 index 2f0bbd7..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR07.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR07", "rgbString":"f26f39", "name":"Cadmium Orange", "rgb":[242, 111, 57], "cie":[62.1186859248387, 47.2400752538203, 52.7122779503977], "hue":"YR", "saturation":"0", "brightness":"7", "alternatives":[{"colorCode":"YR18", "score":1.59676968185942}, {"colorCode":"YR68", "score":3.71870862659495}, {"colorCode":"R24", "score":4.78939707673685}, {"colorCode":"YR09", "score":5.39382870486334}, {"colorCode":"E09", "score":5.91101079170205}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR09.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR09.json deleted file mode 100644 index 43e7d2c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR09.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR09", "rgbString":"f15524", "name":"Chinese Orange", "rgb":[241, 85, 36], "cie":[57.3908599603308, 57.8622503483814, 57.6068133583615], "hue":"YR", "saturation":"0", "brightness":"9", "alternatives":[{"colorCode":"YR27", "score":4.6216853323724}, {"colorCode":"YR18", "score":4.66697973307021}, {"colorCode":"YR68", "score":4.97751557101546}, {"colorCode":"R08", "score":5.1576286057637}, {"colorCode":"YR07", "score":5.26846797422791}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR12.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR12.json deleted file mode 100644 index efea6a5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR12.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR12", "rgbString":"ffe2a6", "name":"Loquat", "rgb":[255, 226, 166], "cie":[90.9647988618495, 1.63748938718089, 33.0143192488426], "hue":"YR", "saturation":"1", "brightness":"2", "alternatives":[{"colorCode":"YR31", "score":1.27006089445079}, {"colorCode":"Y23", "score":2.63737393658155}, {"colorCode":"YR21", "score":3.85713687800564}, {"colorCode":"YG05", "score":4.79506749495242}, {"colorCode":"YR20", "score":4.80886567669005}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR14.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR14.json deleted file mode 100644 index 7d648ee..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR14.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR14", "rgbString":"fec84e", "name":"Caramel", "rgb":[254, 200, 78], "cie":[83.4052411373013, 7.25476337257225, 65.7627627789194], "hue":"YR", "saturation":"1", "brightness":"4", "alternatives":[{"colorCode":"YR24", "score":2.51468415524363}, {"colorCode":"YR04", "score":3.23300909524646}, {"colorCode":"Y26", "score":4.49292558194774}, {"colorCode":"Y38", "score":4.66900724030468}, {"colorCode":"YR16", "score":4.98961183392691}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR15.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR15.json deleted file mode 100644 index 9318368..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR15.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR15", "rgbString":"fbb884", "name":"Pumpkin Yellow", "rgb":[251, 184, 132], "cie":[79.872727125148, 18.2529282823143, 35.8724941842312], "hue":"YR", "saturation":"1", "brightness":"5", "alternatives":[{"colorCode":"E95", "score":1.44481959258445}, {"colorCode":"E15", "score":1.50773527576048}, {"colorCode":"YR82", "score":3.74641709294558}, {"colorCode":"YR04", "score":5.48971382226384}, {"colorCode":"YR65", "score":5.81186508439978}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR16.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR16.json deleted file mode 100644 index 6cf4d92..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR16.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR16", "rgbString":"feb729", "name":"Apricot", "rgb":[254, 183, 41], "cie":[79.0976243319925, 14.6981318394274, 74.745333099601], "hue":"YR", "saturation":"1", "brightness":"6", "alternatives":[{"colorCode":"YR14", "score":4.86530619752057}, {"colorCode":"YR65", "score":5.37599030858958}, {"colorCode":"YR04", "score":6.04490853462282}, {"colorCode":"YR24", "score":6.62680277821794}, {"colorCode":"E95", "score":7.62783628672682}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR18.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR18.json deleted file mode 100644 index 91f99d6..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR18.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR18", "rgbString":"f26b3c", "name":"Sanguine", "rgb":[242, 107, 60], "cie":[61.4109033063202, 49.2483089195758, 50.5419064367043], "hue":"YR", "saturation":"1", "brightness":"8", "alternatives":[{"colorCode":"YR07", "score":1.59877721850372}, {"colorCode":"YR68", "score":1.96916811647219}, {"colorCode":"YR09", "score":4.81695917588184}, {"colorCode":"R24", "score":5.09415489426352}, {"colorCode":"E09", "score":5.36908803327018}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR20.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR20.json deleted file mode 100644 index 95a177c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR20.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR20", "rgbString":"ffe1bf", "name":"Yellowish Shade", "rgb":[255, 225, 191], "cie":[91.1763514917382, 5.28759071608487, 20.4314546482681], "hue":"YR", "saturation":"2", "brightness":"0", "alternatives":[{"colorCode":"Y32", "score":1.72933506494181}, {"colorCode":"E21", "score":1.9332174825217}, {"colorCode":"YR01", "score":2.12499427715382}, {"colorCode":"YR02", "score":2.44478543757581}, {"colorCode":"YR61", "score":2.49838260209832}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR21.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR21.json deleted file mode 100644 index f64c825..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR21.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR21", "rgbString":"f5ddb1", "name":"Cream", "rgb":[245, 221, 177], "cie":[89.0639405748423, 1.76475034125534, 24.6432859605313], "hue":"YR", "saturation":"2", "brightness":"1", "alternatives":[{"colorCode":"E55", "score":1.83979915983733}, {"colorCode":"Y23", "score":2.20603478132158}, {"colorCode":"YR20", "score":2.71501034621366}, {"colorCode":"Y32", "score":2.96264043058136}, {"colorCode":"YR31", "score":3.11184670956227}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR23.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR23.json deleted file mode 100644 index d4caec0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR23.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR23", "rgbString":"eccf8b", "name":"Yellow Ochre", "rgb":[236, 207, 139], "cie":[84.1334486051657, 1.00578421369302, 37.4960255230301], "hue":"YR", "saturation":"2", "brightness":"3", "alternatives":[{"colorCode":"YG93", "score":3.64307451083684}, {"colorCode":"E95", "score":3.93908046879603}, {"colorCode":"E34", "score":4.88172675059663}, {"colorCode":"YG25", "score":5.85019016460608}, {"colorCode":"Y38", "score":6.06957442108286}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR24.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR24.json deleted file mode 100644 index 7dbb8a8..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR24.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR24", "rgbString":"f0cf64", "name":"Pale Sepia", "rgb":[240, 207, 100], "cie":[84.0027288219978, -0.825771478116022, 56.4404923872757], "hue":"YR", "saturation":"2", "brightness":"4", "alternatives":[{"colorCode":"Y38", "score":2.79198045044088}, {"colorCode":"YR14", "score":2.80861758575805}, {"colorCode":"Y26", "score":3.70108863253621}, {"colorCode":"Y35", "score":4.09414475718588}, {"colorCode":"E95", "score":4.88593385916196}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR27.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR27.json deleted file mode 100644 index fab5652..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR27.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR27", "rgbString":"d56638", "name":"Tuscan Orange", "rgb":[213, 102, 56], "cie":[56.0220543532371, 40.6468910040209, 45.5053463591411], "hue":"YR", "saturation":"2", "brightness":"7", "alternatives":[{"colorCode":"E09", "score":2.41153238431001}, {"colorCode":"E39", "score":2.98828026789521}, {"colorCode":"E08", "score":3.7640999484477}, {"colorCode":"R08", "score":5.02867841895272}, {"colorCode":"YR09", "score":5.67610509477057}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR30.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR30.json deleted file mode 100644 index c23c6c2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR30.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR30", "rgbString":"fef2da", "name":"Macadamia Nut", "rgb":[254, 242, 218], "cie":[95.8460121010146, 0.156023496255819, 13.0188702554142], "hue":"YR", "saturation":"3", "brightness":"0", "alternatives":[{"colorCode":"E30", "score":1.17572928686755}, {"colorCode":"YR000", "score":1.60428745932525}, {"colorCode":"E41", "score":2.25913403807044}, {"colorCode":"E11", "score":2.32970231002656}, {"colorCode":"E51", "score":2.5772249396227}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR31.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR31.json deleted file mode 100644 index 8e860f2..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR31.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR31", "rgbString":"ffdea8", "name":"Light Reddish Yellow", "rgb":[255, 222, 168], "cie":[90.0122010021791, 3.91356952406485, 30.7171062375289], "hue":"YR", "saturation":"3", "brightness":"1", "alternatives":[{"colorCode":"YR12", "score":1.29212385497593}, {"colorCode":"Y23", "score":2.15820506920017}, {"colorCode":"YR21", "score":2.78168601000008}, {"colorCode":"E55", "score":4.26044959014703}, {"colorCode":"YR20", "score":4.28125389213703}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR61.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR61.json deleted file mode 100644 index b25ddb3..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR61.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR61", "rgbString":"fddac4", "name":"Yellowish Skin Pink", "rgb":[253, 218, 196], "cie":[89.3981355925353, 8.84843759398213, 15.3098363570445], "hue":"YR", "saturation":"6", "brightness":"1", "alternatives":[{"colorCode":"YR02", "score":0.518124204995482}, {"colorCode":"YR01", "score":0.571256375881477}, {"colorCode":"YR00", "score":1.80894961225632}, {"colorCode":"R12", "score":1.89598879172967}, {"colorCode":"YR20", "score":2.60628498146522}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR65.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR65.json deleted file mode 100644 index 7e15cb5..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR65.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR65", "rgbString":"faae60", "name":"Atoll", "rgb":[250, 174, 96], "cie":[76.9451507351777, 20.2101214022487, 50.4671969534969], "hue":"YR", "saturation":"6", "brightness":"5", "alternatives":[{"colorCode":"YR15", "score":5.03417777305786}, {"colorCode":"E95", "score":5.04390146094387}, {"colorCode":"E97", "score":5.76405800836275}, {"colorCode":"R14", "score":6.34794416297394}, {"colorCode":"E15", "score":6.35580630284096}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR68.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR68.json deleted file mode 100644 index eb1abad..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR68.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR68", "rgbString":"f37022", "name":"Orange", "rgb":[243, 112, 34], "cie":[62.3032528604858, 46.4568489686272, 62.5288127308548], "hue":"YR", "saturation":"6", "brightness":"8", "alternatives":[{"colorCode":"YR18", "score":1.85552561426949}, {"colorCode":"YR07", "score":3.51932193765231}, {"colorCode":"YR09", "score":4.9824519237895}, {"colorCode":"E09", "score":6.96194697028362}, {"colorCode":"YR27", "score":7.31398707990236}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/color/YR82.json b/uml2es/examples/blockFactory/data/blockfactory/color/YR82.json deleted file mode 100644 index 82341ef..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/color/YR82.json +++ /dev/null @@ -1 +0,0 @@ -{"colorCode":"YR82", "rgbString":"fdc68d", "name":"Mellow Peach", "rgb":[253, 198, 141], "cie":[83.5442956165649, 12.5944270334888, 36.015972366934], "hue":"YR", "saturation":"8", "brightness":"2", "alternatives":[{"colorCode":"FYR1", "score":2.31696414986924}, {"colorCode":"E15", "score":2.86749083798244}, {"colorCode":"E95", "score":3.30489256670589}, {"colorCode":"YR15", "score":3.7516444157512}, {"colorCode":"E34", "score":5.05209059093428}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/custom/UCLACampus.json b/uml2es/examples/blockFactory/data/blockfactory/custom/UCLACampus.json deleted file mode 100644 index 8ea1bb0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/custom/UCLACampus.json +++ /dev/null @@ -1 +0,0 @@ -{"modelId":"UCLACampus", "modelName":"UCLA Campus", "status":"INDEV", "requestDate":"2018-03-09-05:00", "clientId":"cucla", "instructions":{"docURL":"https://bf.com/docs/ucla.pdf", "docReleaseTag":"0.1"}, "blocks":[{"quantity":1, "blockNumber":"block998"}, {"quantity":14, "blockNumber":"block836"}, {"quantity":6, "blockNumber":"block795"}, {"quantity":12, "blockNumber":"block148"}, {"quantity":11, "blockNumber":"block342"}, {"quantity":1, "blockNumber":"block150"}, {"quantity":12, "blockNumber":"block879"}, {"quantity":3, "blockNumber":"block379"}, {"quantity":7, "blockNumber":"block866"}, {"quantity":10, "blockNumber":"block6"}, {"quantity":2, "blockNumber":"block675"}, {"quantity":7, "blockNumber":"block888"}, {"quantity":12, "blockNumber":"block581"}, {"quantity":15, "blockNumber":"block276"}, {"quantity":9, "blockNumber":"block10"}, {"quantity":5, "blockNumber":"block425"}, {"quantity":5, "blockNumber":"block913"}, {"quantity":4, "blockNumber":"block639"}, {"quantity":2, "blockNumber":"block202"}, {"quantity":7, "blockNumber":"block113"}, {"quantity":3, "blockNumber":"block586"}, {"quantity":8, "blockNumber":"block769"}, {"quantity":5, "blockNumber":"block546"}, {"quantity":2, "blockNumber":"block728"}, {"quantity":6, "blockNumber":"block689"}, {"quantity":6, "blockNumber":"block240"}, {"quantity":6, "blockNumber":"block178"}, {"quantity":4, "blockNumber":"block384"}, {"quantity":7, "blockNumber":"block220"}, {"quantity":9, "blockNumber":"block820"}, {"quantity":4, "blockNumber":"block225"}, {"quantity":10, "blockNumber":"block931"}, {"quantity":9, "blockNumber":"block685"}, {"quantity":3, "blockNumber":"block122"}, {"quantity":4, "blockNumber":"block105"}, {"quantity":15, "blockNumber":"block891"}, {"quantity":1, "blockNumber":"block129"}, {"quantity":1, "blockNumber":"block476"}, {"quantity":11, "blockNumber":"block835"}, {"quantity":8, "blockNumber":"block602"}, {"quantity":8, "blockNumber":"block559"}, {"quantity":7, "blockNumber":"block621"}, {"quantity":5, "blockNumber":"block927"}, {"quantity":4, "blockNumber":"block42"}, {"quantity":5, "blockNumber":"block722"}, {"quantity":6, "blockNumber":"block970"}, {"quantity":14, "blockNumber":"block349"}, {"quantity":4, "blockNumber":"block448"}, {"quantity":2, "blockNumber":"block793"}, {"quantity":14, "blockNumber":"block670"}, {"quantity":5, "blockNumber":"block373"}, {"quantity":11, "blockNumber":"block593"}, {"quantity":13, "blockNumber":"block281"}, {"quantity":10, "blockNumber":"block257"}, {"quantity":14, "blockNumber":"block489"}, {"quantity":1, "blockNumber":"block117"}, {"quantity":3, "blockNumber":"block800"}, {"quantity":5, "blockNumber":"block83"}, {"quantity":4, "blockNumber":"block419"}, {"quantity":4, "blockNumber":"block917"}, {"quantity":3, "blockNumber":"block233"}, {"quantity":10, "blockNumber":"block990"}, {"quantity":14, "blockNumber":"block372"}, {"quantity":8, "blockNumber":"block229"}, {"quantity":1, "blockNumber":"block686"}, {"quantity":13, "blockNumber":"block530"}, {"quantity":9, "blockNumber":"block771"}, {"quantity":4, "blockNumber":"block93"}, {"quantity":12, "blockNumber":"block372"}, {"quantity":14, "blockNumber":"block561"}, {"quantity":9, "blockNumber":"block210"}, {"quantity":13, "blockNumber":"block692"}, {"quantity":3, "blockNumber":"block428"}, {"quantity":10, "blockNumber":"block327"}, {"quantity":3, "blockNumber":"block128"}, {"quantity":7, "blockNumber":"block798"}, {"quantity":4, "blockNumber":"block966"}, {"quantity":6, "blockNumber":"block962"}, {"quantity":8, "blockNumber":"block421"}, {"quantity":7, "blockNumber":"block148"}, {"quantity":15, "blockNumber":"block865"}, {"quantity":13, "blockNumber":"block669"}, {"quantity":13, "blockNumber":"block232"}, {"quantity":1, "blockNumber":"block37"}, {"quantity":7, "blockNumber":"block336"}, {"quantity":9, "blockNumber":"block433"}, {"quantity":14, "blockNumber":"block985"}, {"quantity":14, "blockNumber":"block78"}, {"quantity":1, "blockNumber":"block281"}, {"quantity":11, "blockNumber":"block602"}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/material/mpine.json b/uml2es/examples/blockFactory/data/blockfactory/material/mpine.json deleted file mode 100644 index c9d87a0..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/material/mpine.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"mpine", "name":"pine", "type":"wood"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/material/mplastic.json b/uml2es/examples/blockFactory/data/blockfactory/material/mplastic.json deleted file mode 100644 index 3820e04..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/material/mplastic.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"mplastic", "name":"plastic", "type":"polymer"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/material/mspruce.json b/uml2es/examples/blockFactory/data/blockfactory/material/mspruce.json deleted file mode 100644 index 4077896..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/material/mspruce.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"mspruce", "name":"spruce", "type":"wood"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/material/mwalnut.json b/uml2es/examples/blockFactory/data/blockfactory/material/mwalnut.json deleted file mode 100644 index 73f4dba..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/material/mwalnut.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"mwalnut", "name":"walnut", "type":"wood"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/model/EmpireStateBuilding.json b/uml2es/examples/blockFactory/data/blockfactory/model/EmpireStateBuilding.json deleted file mode 100644 index 867104c..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/model/EmpireStateBuilding.json +++ /dev/null @@ -1 +0,0 @@ -{"modelId":"EmpireStateBuilding", "modelName":"Empire State Building", "instructions":{"docURL":"https://bf.com/docs/esb.pdf", "docReleaseTag":"2.1"}, "blocks":[{"quantity":13, "blockNumber":"block506"}, {"quantity":7, "blockNumber":"block665"}, {"quantity":14, "blockNumber":"block189"}, {"quantity":7, "blockNumber":"block971"}, {"quantity":9, "blockNumber":"block642"}, {"quantity":3, "blockNumber":"block364"}, {"quantity":11, "blockNumber":"block278"}, {"quantity":7, "blockNumber":"block96"}, {"quantity":15, "blockNumber":"block15"}, {"quantity":4, "blockNumber":"block78"}, {"quantity":10, "blockNumber":"block83"}, {"quantity":15, "blockNumber":"block148"}, {"quantity":6, "blockNumber":"block628"}, {"quantity":8, "blockNumber":"block610"}, {"quantity":3, "blockNumber":"block667"}, {"quantity":13, "blockNumber":"block752"}, {"quantity":8, "blockNumber":"block165"}, {"quantity":2, "blockNumber":"block678"}, {"quantity":5, "blockNumber":"block356"}, {"quantity":12, "blockNumber":"block206"}, {"quantity":9, "blockNumber":"block760"}, {"quantity":1, "blockNumber":"block100"}, {"quantity":15, "blockNumber":"block834"}, {"quantity":11, "blockNumber":"block574"}, {"quantity":10, "blockNumber":"block930"}, {"quantity":11, "blockNumber":"block202"}, {"quantity":3, "blockNumber":"block111"}, {"quantity":5, "blockNumber":"block976"}, {"quantity":10, "blockNumber":"block76"}, {"quantity":7, "blockNumber":"block118"}, {"quantity":1, "blockNumber":"block463"}, {"quantity":8, "blockNumber":"block860"}, {"quantity":1, "blockNumber":"block639"}, {"quantity":4, "blockNumber":"block51"}, {"quantity":3, "blockNumber":"block915"}, {"quantity":7, "blockNumber":"block661"}, {"quantity":4, "blockNumber":"block29"}, {"quantity":4, "blockNumber":"block706"}, {"quantity":5, "blockNumber":"block370"}, {"quantity":1, "blockNumber":"block407"}, {"quantity":1, "blockNumber":"block936"}, {"quantity":3, "blockNumber":"block115"}, {"quantity":1, "blockNumber":"block783"}, {"quantity":11, "blockNumber":"block311"}, {"quantity":11, "blockNumber":"block815"}, {"quantity":9, "blockNumber":"block288"}, {"quantity":1, "blockNumber":"block553"}, {"quantity":8, "blockNumber":"block648"}, {"quantity":9, "blockNumber":"block334"}, {"quantity":15, "blockNumber":"block451"}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/data/blockfactory/model/TajMahal.json b/uml2es/examples/blockFactory/data/blockfactory/model/TajMahal.json deleted file mode 100644 index eb54966..0000000 --- a/uml2es/examples/blockFactory/data/blockfactory/model/TajMahal.json +++ /dev/null @@ -1 +0,0 @@ -{"modelId":"TajMahal", "modelName":"Taj Mahal", "instructions":{"docURL":"https://bf.com/docs/tm.pdf", "docReleaseTag":"1.3"}, "blocks":[{"quantity":15, "blockNumber":"block573"}, {"quantity":1, "blockNumber":"block775"}, {"quantity":6, "blockNumber":"block474"}, {"quantity":15, "blockNumber":"block208"}, {"quantity":5, "blockNumber":"block332"}, {"quantity":8, "blockNumber":"block14"}, {"quantity":8, "blockNumber":"block76"}, {"quantity":12, "blockNumber":"block61"}, {"quantity":11, "blockNumber":"block935"}, {"quantity":12, "blockNumber":"block449"}, {"quantity":11, "blockNumber":"block665"}, {"quantity":9, "blockNumber":"block714"}, {"quantity":14, "blockNumber":"block527"}, {"quantity":3, "blockNumber":"block620"}, {"quantity":9, "blockNumber":"block270"}, {"quantity":5, "blockNumber":"block379"}, {"quantity":15, "blockNumber":"block387"}, {"quantity":2, "blockNumber":"block671"}, {"quantity":7, "blockNumber":"block350"}, {"quantity":1, "blockNumber":"block706"}, {"quantity":15, "blockNumber":"block792"}, {"quantity":3, "blockNumber":"block118"}, {"quantity":5, "blockNumber":"block84"}, {"quantity":8, "blockNumber":"block631"}, {"quantity":2, "blockNumber":"block551"}, {"quantity":12, "blockNumber":"block474"}, {"quantity":15, "blockNumber":"block339"}, {"quantity":5, "blockNumber":"block908"}, {"quantity":11, "blockNumber":"block845"}, {"quantity":13, "blockNumber":"block138"}, {"quantity":4, "blockNumber":"block472"}, {"quantity":1, "blockNumber":"block446"}, {"quantity":15, "blockNumber":"block902"}, {"quantity":8, "blockNumber":"block237"}, {"quantity":10, "blockNumber":"block413"}, {"quantity":9, "blockNumber":"block863"}, {"quantity":7, "blockNumber":"block331"}, {"quantity":14, "blockNumber":"block975"}, {"quantity":2, "blockNumber":"block648"}, {"quantity":2, "blockNumber":"block80"}, {"quantity":6, "blockNumber":"block168"}, {"quantity":11, "blockNumber":"block416"}, {"quantity":6, "blockNumber":"block640"}, {"quantity":2, "blockNumber":"block326"}, {"quantity":9, "blockNumber":"block668"}, {"quantity":6, "blockNumber":"block823"}, {"quantity":6, "blockNumber":"block468"}, {"quantity":8, "blockNumber":"block359"}, {"quantity":2, "blockNumber":"block118"}, {"quantity":12, "blockNumber":"block958"}, {"quantity":1, "blockNumber":"block41"}, {"quantity":14, "blockNumber":"block531"}, {"quantity":12, "blockNumber":"block134"}, {"quantity":7, "blockNumber":"block498"}, {"quantity":4, "blockNumber":"block443"}, {"quantity":7, "blockNumber":"block311"}, {"quantity":6, "blockNumber":"block923"}, {"quantity":1, "blockNumber":"block713"}, {"quantity":7, "blockNumber":"block474"}, {"quantity":4, "blockNumber":"block215"}]} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/gradle.properties b/uml2es/examples/blockFactory/gradle.properties deleted file mode 100755 index feeb965..0000000 --- a/uml2es/examples/blockFactory/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -mlAppName=xmi2es-examples-blockFactory -mlHost=localhost -mlUsername=admin -mlPassword=admin -mlRestPort=11259 -mlAppServicesPort=11259 -mlAppServicesHost=localhost -mlTestRestPort=11258 diff --git a/uml2es/examples/blockFactory/src/main/ml-config/databases/content-database.json b/uml2es/examples/blockFactory/src/main/ml-config/databases/content-database.json deleted file mode 100644 index e5478ca..0000000 --- a/uml2es/examples/blockFactory/src/main/ml-config/databases/content-database.json +++ /dev/null @@ -1 +0,0 @@ -{"database-name":"%%DATABASE%%", "schema-database":"%%SCHEMAS_DATABASE%%", "path-namespace":[{"prefix":"es", "namespace-uri":"http://marklogic.com/entity-services"}], "triple-index":true, "collection-lexicon":true} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/src/main/ml-config/databases/schemas-database.json b/uml2es/examples/blockFactory/src/main/ml-config/databases/schemas-database.json deleted file mode 100644 index 1361cb5..0000000 --- a/uml2es/examples/blockFactory/src/main/ml-config/databases/schemas-database.json +++ /dev/null @@ -1 +0,0 @@ -{"database-name": "%%SCHEMAS_DATABASE%%"} \ No newline at end of file diff --git a/uml2es/examples/blockFactory/src/main/ml-modules/ext/entity-services/BlockFactory-0.0.1.xqy b/uml2es/examples/blockFactory/src/main/ml-modules/ext/entity-services/BlockFactory-0.0.1.xqy deleted file mode 100644 index 309185b..0000000 --- a/uml2es/examples/blockFactory/src/main/ml-modules/ext/entity-services/BlockFactory-0.0.1.xqy +++ /dev/null @@ -1,671 +0,0 @@ -xquery version '1.0-ml'; - -(: - This module was generated by MarkLogic Entity Services. - The source model was BlockFactory-0.0.1 - - For usage and extension points, see the Entity Services Developer's Guide - - https://docs.marklogic.com/guide/entity-services - - After modifying this file, put it in your project for deployment to the modules - database of your application, and check it into your source control system. - - Generated at timestamp: 2018-04-04T09:12:18.558211-04:00 - :) - -(: -IMPL Notes: -1. We add a big block comment with the facts of the extended ES model. Our code references this. -2. Most extract-instance functions are modified for source-to-target mapping. -3. We build the abbreviated, denormalized form of the block part. -4. The signature for the extract-instance functions are enhanced. Newly added parameters are the content and context maps -from MLCP. This allows the function to adjust URI, collections, perms, and other options of the document. - -Here is the big comment: - -Your model has the following extended facts. These facts are also saved as triples in your content DB:@prefix p7: . -@prefix xs: . -@prefix p0: . -@prefix p5: . -@prefix p2: . -@prefix p4: . -@prefix p1: . -@prefix p6: . - -p5:blocks p1:reference p0:BlockModelPart ; - p1:relationship "composite" ; - p1:typeIsReference - "true"^^xs:boolean . - -p0:Block p1:collections "part" . - -p0:BlockModel p1:collections "product" . - -p4:blocks p1:reference p0:BlockModelPart ; - p1:relationship "composite" ; - p1:typeIsReference - "true"^^xs:boolean . - -_:bnode4721720869404596580 - p1:associationClassEndAttribute - p6:alternatives ; - p1:associationClassEndFK - "true"^^xs:boolean ; - p1:associationClassEndClass - p0:BlockColor . - -p6:alternatives p1:reference p0:BlockColor ; - p1:relationship "association" ; - p1:typeIsReference - "true"^^xs:boolean ; - p1:associationClass - p0:Similarity . - -p4:instructions p1:reference p0:Instructions ; - p1:relationship "shared" ; - p1:typeIsReference - "true"^^xs:boolean . - -p2:material p1:reference p0:Material ; - p1:relationship "association" ; - p1:typeIsReference - "true"^^xs:boolean . - -p5:instructions p1:reference p0:Instructions ; - p1:relationship "shared" ; - p1:typeIsReference - "true"^^xs:boolean . - -p5:clientRequester - p1:reference p0:Client ; - p1:relationship "association" ; - p1:typeIsReference - "true"^^xs:boolean . - -p2:color p1:reference p0:BlockColor ; - p1:relationship "association" ; - p1:typeIsReference - "true"^^xs:boolean . - -p0:Similarity p1:hasAssociationClassEnd - _:bnode4721720869404596580 ; - p1:isAssociationClass - "true"^^xs:boolean . - -p7:blockSummary p1:reference p0:Block ; - p1:reminder "abbrev and denorm" ; - p1:relationship "association" ; - p1:typeIsReference - "true"^^xs:boolean . - -p0:CustomBlockModel - p1:collections "product" , - "custom" , - "product" ; - p1:baseClass p0:BlockModel . - -:) - - -module namespace blockFactory - = 'http://com.marlogic.es.umldemo.blockfactory#BlockFactory-0.0.1'; - -import module namespace es = 'http://marklogic.com/entity-services' - at '/MarkLogic/entity-services/entity-services.xqy'; - -import module namespace json = "http://marklogic.com/xdmp/json" - at "/MarkLogic/json/json.xqy"; - - -declare option xdmp:mapping 'false'; - - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a Block - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-Block( - $source as item()?, $content as map:map, $context as map:map -) as map:map -{ - (: IMPL: source mapping, collections :) - - let $source-node := es:init-source($source, 'Block') - let $blockNumber := $source-node/blockNumber ! xs:string(.) - let $length := $source-node/length ! xs:float(.) - let $width := $source-node/width ! xs:float(.) - let $height := $source-node/height ! xs:float(.) - let $mass := $source-node/mass ! xs:float(.) - let $color := $source-node/colorCode ! xs:string(.) - let $material := $source-node/materialId ! xs:string(.) - let $instance := es:init-instance($source-node, 'Block') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - (: As per extension note above, we should add to "part" collection :) - let $collections := map:get($context, "collections") - let $_ := map:put($context, "collections", ($collections, "part")) - - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('blockNumber', $blockNumber) - => map:with('length', $length) - => map:with('width', $width) - => map:with('height', $height) - => map:with('mass', $mass) - => map:with('color', $color) - => map:with('material', $material) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a Instructions - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-Instructions( - $source as item()? -) as map:map -{ - let $source-node := es:init-source($source, 'Instructions') - let $docURL := $source-node/docURL ! xs:string(.) - let $docReleaseTag := $source-node/docReleaseTag ! xs:string(.) - let $instance := es:init-instance($source-node, 'Instructions') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('docURL', $docURL) - => map:with('docReleaseTag', $docReleaseTag) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a BlockModel - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-BlockModel( - $source as item()?, $content as map:map, $context as map:map -) as map:map -{ - (: IMPL: collectons :) - - let $source-node := es:init-source($source, 'BlockModel') - (: The following property is a local reference. :) - let $blocks := es:extract-array($source-node/blocks, blockFactory:extract-instance-BlockModelPart#1) - (: The following property is a local reference. :) - let $instructions := $source-node/instructions ! blockFactory:extract-instance-Instructions(.) - let $modelId := $source-node/modelId ! xs:string(.) - let $modelName := $source-node/modelName ! xs:string(.) - let $instance := es:init-instance($source-node, 'BlockModel') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - (: As per extension note above, we should add to "product" collection :) - let $collections := map:get($context, "collections") - let $_ := map:put($context, "collections", ($collections, "product")) - - return - if (empty($source-node/*)) - then $instance - else $instance - =>es:optional('blocks', $blocks) - => map:with('instructions', $instructions) - => map:with('modelId', $modelId) - => map:with('modelName', $modelName) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a Client - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-Client( - $source as item()?, $content as map:map, $context as map:map -) as map:map -{ - (: IMPL: source mapping changes :) - - let $source-node := es:init-source($source, 'Client') - let $clientId := $source-node/id ! xs:string(.) - let $clientName := $source-node/name ! xs:string(.) - let $clientCountry := $source-node/country ! xs:string(.) - let $instance := es:init-instance($source-node, 'Client') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('clientId', $clientId) - => map:with('clientName', $clientName) - => map:with('clientCountry', $clientCountry) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a CustomBlockModel - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-CustomBlockModel( - $source as item()?, $content as map:map, $context as map:map -) as map:map -{ - (: IMPL: source mappings, collections :) - - let $source-node := es:init-source($source, 'CustomBlockModel') - let $clientRequester := $source-node/clientId ! xs:string(.) - let $requestDate := $source-node/requestDate ! xs:date(.) - let $completionDate := $source-node/completionDate ! xs:date(.) - let $status := $source-node/status ! xs:string(.) - (: The following property is a local reference. :) - let $blocks := es:extract-array($source-node/blocks, blockFactory:extract-instance-BlockModelPart#1) - (: The following property is a local reference. :) - let $instructions := $source-node/instructions ! blockFactory:extract-instance-Instructions(.) - let $modelId := $source-node/modelId ! xs:string(.) - let $modelName := $source-node/modelName ! xs:string(.) - let $instance := es:init-instance($source-node, 'CustomBlockModel') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - (: As per extension note above, we should add to "product" and "custom" collections :) - let $collections := map:get($context, "collections") - let $_ := map:put($context, "collections", ($collections, "product", "custom")) - - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('clientRequester', $clientRequester) - => map:with('requestDate', $requestDate) - =>es:optional('completionDate', $completionDate) - => map:with('status', $status) - =>es:optional('blocks', $blocks) - => map:with('instructions', $instructions) - => map:with('modelId', $modelId) - => map:with('modelName', $modelName) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a BlockColor - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-BlockColor( - $source as item()?, $content as map:map, $context as map:map -) as map:map -{ - let $source-node := es:init-source($source, 'BlockColor') - let $colorCode := $source-node/colorCode ! xs:string(.) - let $rgbString := $source-node/rgbString ! xs:string(.) - let $name := $source-node/name ! xs:string(.) - (: The following property is a local reference. :) - let $alternatives := es:extract-array($source-node/alternatives, blockFactory:extract-instance-Similarity#1) - let $rgb := json:to-array($source-node/rgb ! xs:int(.) ) - let $cie := json:to-array($source-node/cie ! xs:float(.) ) - let $hue := $source-node/hue ! xs:string(.) - let $saturation := $source-node/saturation ! xs:string(.) - let $brightness := $source-node/brightness ! xs:string(.) - let $instance := es:init-instance($source-node, 'BlockColor') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('colorCode', $colorCode) - => map:with('rgbString', $rgbString) - => map:with('name', $name) - =>es:optional('alternatives', $alternatives) - => map:with('rgb', $rgb) - => map:with('cie', $cie) - => map:with('hue', $hue) - => map:with('saturation', $saturation) - => map:with('brightness', $brightness) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a BlockModelPart - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-BlockModelPart( - $source as item()? -) as map:map -{ - (: IMPL: this is where we do the abbreviate and denorm :) - - (: grab the block, material, color :) - let $source-node := es:init-source($source, 'BlockModelPart') - let $block := fn:doc(concat("/xmi2es/blockFactory/block/", $source-node/blockNumber, ".json"))/envelope/instance/Block - let $material := fn:doc(concat("/xmi2es/blockFactory/material/", $block/material, ".json"))/envelope/instance/Material - let $color := fn:doc(concat("/xmi2es/blockFactory/color/", $block/color, ".json"))/envelope/instance/BlockColor - let $_ := - if (not(exists($block)) or not(exists($material)) or not(exists($color))) then - xdmp:log(concat("Unable to resolve structure of block *", $source-node/blockNumber, "*"), "error") - else () - - let $quantity := $source-node/quantity ! xs:int(.) - let $blockNumber := $source-node/blockNumber ! xs:string(.) - let $blockDim := concat($block/length, "x", $block/width, "x", $block/height) ! xs:string(.) - let $materialId := $material/materialId ! xs:string(.) - let $materialName := $material/materialName ! xs:string(.) - let $materialType := $material/materialType ! xs:string(.) - let $colorCode := $color/colorCode ! xs:string(.) - let $colorName := $color/name ! xs:string(.) - let $closestColor := $color/alternatives[1]/Similarity/refBlockColor ! xs:string(.) - let $closestColorName := fn:doc(concat("/xmi2es/blockFactory/color/", $closestColor, ".json"))/envelope/instance/BlockColor/name ! xs:string(.) - - let $instance := es:init-instance($source-node, 'BlockModelPart') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('quantity', $quantity) - => map:with('blockNumber', $blockNumber) - =>es:optional('blockDim', $blockDim) - =>es:optional('materialId', $materialId) - =>es:optional('materialName', $materialName) - =>es:optional('materialType', $materialType) - =>es:optional('colorCode', $colorCode) - =>es:optional('colorName', $colorName) - =>es:optional('closestColor', $closestColor) - =>es:optional('closestColorName', $closestColorName) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a Material - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-Material( - $source as item()?, $content as map:map, $context as map:map -) as map:map -{ - (: IMPL: source mapping changes :) - let $source-node := es:init-source($source, 'Material') - let $materialId := $source-node/id ! xs:string(.) - let $materialName := $source-node/name ! xs:string(.) - let $materialType := $source-node/type ! xs:string(.) - let $instance := es:init-instance($source-node, 'Material') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('materialId', $materialId) - => map:with('materialName', $materialName) - => map:with('materialType', $materialType) -}; - -(:~ - : Extracts instance data, as a map:map, from some source document. - : @param $source-node A document or node that contains - : data for populating a Similarity - : @return A map:map instance with extracted data and - : metadata about the instance. - :) -declare function blockFactory:extract-instance-Similarity( - $source as item()? -) as map:map -{ - (: IMPL: source mapping :) - - let $source-node := es:init-source($source, 'Similarity') - let $score := $source-node/score ! xs:float(.) - let $refBlockColor := $source-node/colorCode ! xs:string(.) - let $instance := es:init-instance($source-node, 'Similarity') - (: Comment or remove the following line to suppress attachments :) - =>es:add-attachments($source) - - return - if (empty($source-node/*)) - then $instance - else $instance - => map:with('score', $score) - => map:with('refBlockColor', $refBlockColor) -}; - - -(:~ - : Turns an entity instance into a canonical document structure. - : Results in either a JSON document, or an XML document that conforms - : to the entity-services schema. - : Using this function as-is should be sufficient for most use - : cases, and will play well with other generated artifacts. - : @param $entity-instance A map:map instance returned from one of the extract-instance - : functions. - : @param $format Either "json" or "xml". Determines output format of function - : @return An XML element that encodes the instance. - :) -declare function blockFactory:instance-to-canonical( - - $entity-instance as map:map, - $instance-format as xs:string -) as node() -{ - - if ($instance-format eq "json") - then xdmp:to-json( blockFactory:canonicalize($entity-instance) )/node() - else blockFactory:instance-to-canonical-xml($entity-instance) -}; - - -(:~ - : helper function to turn map structure of an instance, which uses specialized - : keys to encode metadata, into a document tree, which uses the node structure - : to encode all type and property information. - :) -declare private function blockFactory:canonicalize( - $entity-instance as map:map -) as map:map -{ - json:object() - =>map:with( map:get($entity-instance,'$type'), - if ( map:contains($entity-instance, '$ref') ) - then fn:head( (map:get($entity-instance, '$ref'), json:object()) ) - else - let $m := json:object() - let $_ := - for $key in map:keys($entity-instance) - let $instance-property := map:get($entity-instance, $key) - where ($key castable as xs:NCName) - return - typeswitch ($instance-property) - (: This branch handles embedded objects. You can choose to prune - an entity's representation of extend it with lookups here. :) - case json:object - return - if (empty(map:keys($instance-property))) - then map:put($m, $key, json:object()) - else map:put($m, $key, blockFactory:canonicalize($instance-property)) - (: An array can also treated as multiple elements :) - case json:array - return - ( - for $val at $i in json:array-values($instance-property) - return - if ($val instance of json:object) - then json:set-item-at($instance-property, $i, blockFactory:canonicalize($val)) - else (), - map:put($m, $key, $instance-property) - ) - - (: A sequence of values should be simply treated as multiple elements :) - (: TODO is this lossy? :) - case item()+ - return - for $val in $instance-property - return map:put($m, $key, $val) - default return map:put($m, $key, $instance-property) - return $m) -}; - - - - - -(:~ - : Turns an entity instance into an XML structure. - : This out-of-the box implementation traverses a map structure - : and turns it deterministically into an XML tree. - : Using this function as-is should be sufficient for most use - : cases, and will play well with other generated artifacts. - : @param $entity-instance A map:map instance returned from one of the extract-instance - : functions. - : @return An XML element that encodes the instance. - :) -declare private function blockFactory:instance-to-canonical-xml( - $entity-instance as map:map -) as element() -{ - (: Construct an element that is named the same as the Entity Type :) - let $namespace := map:get($entity-instance, "$namespace") - let $namespace-prefix := map:get($entity-instance, "$namespacePrefix") - let $nsdecl := - if ($namespace) then - namespace { $namespace-prefix } { $namespace } - else () - let $type-name := map:get($entity-instance, '$type') - let $type-qname := - if ($namespace) - then fn:QName( $namespace, $namespace-prefix || ":" || $type-name) - else $type-name - return - element { $type-qname } { - $nsdecl, - if ( map:contains($entity-instance, '$ref') ) - then map:get($entity-instance, '$ref') - else - for $key in map:keys($entity-instance) - let $instance-property := map:get($entity-instance, $key) - let $ns-key := - if ($namespace and $key castable as xs:NCName) - then fn:QName( $namespace, $namespace-prefix || ":" || $key) - else $key - where ($key castable as xs:NCName) - return - typeswitch ($instance-property) - (: This branch handles embedded objects. You can choose to prune - an entity's representation of extend it with lookups here. :) - case json:object+ - return - for $prop in $instance-property - return element { $ns-key } { blockFactory:instance-to-canonical-xml($prop) } - (: An array can also treated as multiple elements :) - case json:array - return - for $val in json:array-values($instance-property) - return - if ($val instance of json:object) - then element { $ns-key } { - attribute datatype { 'array' }, - blockFactory:instance-to-canonical-xml($val) - } - else element { $ns-key } { - attribute datatype { 'array' }, - $val } - (: A sequence of values should be simply treated as multiple elements :) - case item()+ - return - for $val in $instance-property - return element { $ns-key } { $val } - default return element { $ns-key } { $instance-property } - } -}; - - -(: - : Wraps a canonical instance (returned by instance-to-canonical()) - : within an envelope patterned document, along with the source - : document, which is stored in an attachments section. - : @param $entity-instance an instance, as returned by an extract-instance - : function - : @param $entity-format Either "json" or "xml", selects the output format - : for the envelope - : @return A document which wraps both the canonical instance and source docs. - :) -declare function blockFactory:instance-to-envelope( - $entity-instance as map:map, - $envelope-format as xs:string -) as document-node() -{ - let $canonical := blockFactory:instance-to-canonical($entity-instance, $envelope-format) - let $attachments := es:serialize-attachments($entity-instance, $envelope-format) - return - if ($envelope-format eq "xml") - then - document { - element es:envelope { - element es:instance { - element es:info { - element es:title { map:get($entity-instance,'$type') }, - element es:version { '0.0.1' } - }, - $canonical - }, - $attachments - } - } - else - document { - object-node { 'envelope' : - object-node { 'instance' : - object-node { 'info' : - object-node { - 'title' : map:get($entity-instance,'$type'), - 'version' : '0.0.1' - } - } - + - $canonical - } - + - $attachments - } - } -}; - - -(: - : @param $entity-instance an instance, as returned by an extract-instance - : function - : @return A document which wraps both the canonical instance and source docs. - :) -declare function blockFactory:instance-to-envelope( - $entity-instance as map:map -) as document-node() -{ - blockFactory:instance-to-envelope($entity-instance, "xml") -}; - - - diff --git a/uml2es/examples/blockFactory/src/main/ml-modules/root/xmi2es/loadBlockFactoryTransformation.xqy b/uml2es/examples/blockFactory/src/main/ml-modules/root/xmi2es/loadBlockFactoryTransformation.xqy deleted file mode 100644 index 015bfb0..0000000 --- a/uml2es/examples/blockFactory/src/main/ml-modules/root/xmi2es/loadBlockFactoryTransformation.xqy +++ /dev/null @@ -1,30 +0,0 @@ -xquery version "1.0-ml"; -module namespace xmi2esBlockFactory = "http://marklogic.com/xmi2es/blockFactory"; - -import module namespace es = "http://marklogic.com/entity-services" at "/MarkLogic/entity-services/entity-services.xqy"; -import module namespace blockFactoryModel = 'http://com.marlogic.es.umldemo.blockfactory#BlockFactory-0.0.1' at "/ext/entity-services/BlockFactory-0.0.1.xqy"; - -declare function xmi2esBlockFactory:transform( - $content as map:map, - $context as map:map -) as map:map* { - - (: - Notice we pass content and context to the converter. I added that to allow control over doc-level stuff. - The "extended ES model" allows doc-level stuff like collections, perms, etc. - :) - let $sourceDoc := map:get($content, "value") - let $docType := string(map:get($context, "transform_param")) - let $canonInstance := - if ($docType eq "client") then blockFactoryModel:extract-instance-Client($sourceDoc, $content, $context) - else if ($docType = "block") then blockFactoryModel:extract-instance-Block($sourceDoc, $content, $context) - else if ($docType = "material") then blockFactoryModel:extract-instance-Material($sourceDoc, $content, $context) - else if ($docType = "color") then blockFactoryModel:extract-instance-BlockColor($sourceDoc, $content, $context) - else if ($docType = "model") then blockFactoryModel:extract-instance-BlockModel($sourceDoc, $content, $context) - else if ($docType = "custom") then blockFactoryModel:extract-instance-CustomBlockModel($sourceDoc, $content, $context) - else concat("Illegal doc type ", $docType) - let $envDoc := blockFactoryModel:instance-to-envelope($canonInstance, "json") - let $updatedDoc := map:put($content, "value", $envDoc) - - return $content -}; diff --git a/uml2es/examples/declarativeCity/README.md b/uml2es/examples/declarativeCity/README.md deleted file mode 100644 index 1f20253..0000000 --- a/uml2es/examples/declarativeCity/README.md +++ /dev/null @@ -1,138 +0,0 @@ -# A City Data Model With "Declarative Mapper" Source Mapping - -## Intro -This example shows the interop of two tools: our UML-to-Entity Services toolkit; and the Declarative Mapper (TBD - link). The Declarative Mapper tool allows us to map data from source to target document using a configurable template. We map source to target without writing code. Rather, we compose a template, which is an XML or JSON document that specifies mapping expressions to transform source to target. At runtime, we apply the template to each source document; the Declarative Mapper outputs the desired target document. - -Using Declarative Mapper as a standlone tool, we would write the template by hand. In this example, we generate it from a UML model. Our UML model defines the target structure of a city. Within the model, we use stereotypes from our ML profile to configure Declarative Mapper transformation expressions for each attribute. - -Here is our UML model. - -![DeclarativeCity](../umlModels/DeclarativeCity.png) - -Notice we have a class, called City, consisting of several attributes: name, countryCode, population, metroPopulation, dense, and countryName. City is our target structure. We want the output of Declarative Mapper to bear the structure of City. The source data -- the input of Declarative Mapper -- has a much different structure. We don't model in UML the structure of the source. Rather, in the UML model, for each attribute, we stereotype the attribute as xImpl and tag the stereotype with a mapping expression. The stereotype indicates how we obtain the value of that attribute from source data. In effect, the UML model defines the target structure and reveals how to arrive at that structure from source data. - -In our example we have two sources of data: dmdemo and funbase. Each source has its own structure, and thus each needs its own mapping. - -dmdemo is a large JSON file, population.json, that contains hundreds of city records. Here is an excerpt: - - { - "name": "BEIJING", - "country": "CN", - "population": "18590", - "metro-population": "24900", - "language": "zh-CN" - }, - { - "name": "Karachi", - "country": "PK", - "population": "18000", - "metro-population": "27506", - "language": "es" - } - -In funbase, cities are defined in a CSV. Here is an excerpt: - - city_name,country - Otter Lake,USA - US Flag,Moon - Venustown,Mars - -For a given attribute, the xImpl stereotype's tagged value defines how to map that attribute from source. Here is the mapping for countryName: - - * http://marklogic.com/xmi2es/xes/mapper/dmdemo,"""[[lookup('/countries.json', extract('country'), coalesce(@language, 'en'))]]""" - * http://marklogic.com/xmi2es/xes/mapper/funbase,"""[[extract('country')]]""" - -The first of these is the dmdemo mapping; to obtain countryName, we lookup in another document (countries.json), the English text name for the country whose code country source attribute. The second is the funbase mapping; from funbase the country attribute maps to the target countryName attribute. - -When we put these transformations together -- you'll see this later when you open the Query Console workspace and work through the exercise -- we have enough detail to fully define Declarative Mapper templates for each source. Here is the template to produce a City document from dmdemo source. - - - XML - - - -Here is the template to produce a City document from funbase source: - - - XML - - - -The following figure shows the end-to-end flow. We define our model in our favorite toolkit-compliant UML tool. From that tool we export is as XMI and pass it though our UML-to-Entity Services toolkit. From the resulting Entity Services model (both the base model and its extensions), we generate the Declarative Mapper templates for each source. We produce target documents by applying these templates to the source documents. Significantly, the target documents have the form of our UML model. And we didn't have to write the templates by hand; our UML model defines them! - -![End to end diagram](./end2end.png) - - -A few design points to mention: -- For many data models, we avoid source mapping altogether. The model shows the target we wish to build. There might be many sources from which the target obtains its data. The source structure is possibly very messy. The logic to transform source to target might be better expressed using a transform language than as stereotypes in the model. Even when the mapping is straightforward, we might consider the data model the wrong place to indicate source mapping logic. -- We use the generic xImpl stereotype to specify source mapping. This stereotype can be used to specify any sort of design advice. We might have created a specific stereotype for source mapping. We haven't gone down that path because source mapping isn't often included in the data model artifact. See previous point. -- xImpl allows us to specify design advice as semantic triples. These triples are added to the extended Entity Services model. In the section "Explore the Mapping" you will see how we generate Declarative Mapper templates from these triples. Notice that we provide only the predicate and object. The predicate indicates which mapping to use -- in our example it's either dmdemo or funbase. The object is the Declarative Mapper expression. (As for the subject, it is the Entity Services IRI for the attribute.) In effect the triple says: for this attribute, from the source of type dmdemo (or funbase), use the following Declarative Mapper expression to obtain the value of the attribute. - -## How to run: - -Our project uses gradle. Before running, view the settings in gradle.properties. Create a file called gradle-local.properties and in this file override any of the properties from gradle.properties. - -Here are the steps to setup. - -### Setup DB -Setup new DB. Will use basic DB config with no indexes. Will bring in XMI2ES transform to our modules. - -Run the following: - -gradle -PenvironmentName=local -i setup mlDeploy - -Confirm: -- New DB and app server created with name xmi2es-examples-dmcity. - -### Import the Model - -Run the following to load the model: - -gradle -b uml2es.gradle -PenvironmentName=local -i -PmodelName=DeclarativeCity uDeployModel - -Confirm: -- Content DB includes several documents created when loading the XMI, including: - * /marklogic.com/entity-services/models/DeclarativeCity.json - the ES model - * /xmi2es/extension/DeclarativeCity.ttl - the extended ES model - * /xmi2es/findings/DeclarativeCity.xml - findings during the transform - -Check the /xmi2es/findings/DeclarativeCity.xml file. This indicates whether there were any issues during the transform. Verify there are none. - -### Load the Source Data - -Load the source data into our content database: - -gradle -PenvironmentName=local -i loadSources - -Confirm: -- Content DB now has, in addition to the documents created in the previous step, the following documents - - * /population.json - A large JSON containing the source city data for the dmdemo data set - * /countries.json - A JSON lookup file that maps country code to country name. Used during our Declarative Mapper transformation. - * /Otter Lake.json - A city record from the funbase data set. - * /US Flag.json - A city record from the funbase data set. - * /Venustown.json - A city record from the funbase data set. - -### Deploy Declarative Mapper - -Obtain the Declarative Mapper tool and deploy to the modules database from this example: xmi2es-examples-dmcity-modules. (If you deploy it to a different modules database in the instance, following the instructions in the workspace to point to that modules DB.) - -## Explore the Mapping -In Query Console, import XMI2ESDeclarative.xml workspace. You won't want to miss this part; it's where the fun happens. In this workspace you will: -- Examine the source data and the entity services model. -- Generate the Declarative Mapper templates -- Pass the source data through the Declarative Mapper templates to obtain target data that conforms to the Entity Services model. diff --git a/uml2es/examples/declarativeCity/XMI2ESDeclarativeCity.xml b/uml2es/examples/declarativeCity/XMI2ESDeclarativeCity.xml deleted file mode 100644 index a6b262c..0000000 --- a/uml2es/examples/declarativeCity/XMI2ESDeclarativeCity.xml +++ /dev/null @@ -1,123 +0,0 @@ -'use strict'; - -var sem = require("/MarkLogic/semantics.xqy"); - -/* -Let's take a look at the most important outputs of the UML-2-ES transform of our city data model -Make sure your database is xmi2es-examples-dmcity-content -*/ - -[ - "the entity services city model", cts.doc("/xmi2es/es/DeclarativeCity.json"), - "the extended model - and notice our Declarative Mapper expressions", sem.rdfParse(cts.doc("/xmi2es/extension/DeclarativeCity.ttl"), ["turtle"]) -]'use strict'; - -/* -Let's take a look at the most source data. -Make sure your database is xmi2es-examples-dmcity-content -*/ - -[ - "funbase", cts.search(cts.collectionQuery("funbase")), - "dmdemo", cts.doc("/population.json"), - "lookup country code to name", cts.doc("/countries.json") -]'use strict'; - -/* -Apply declarative mapper templates to inputs. -Make sure your database is xmi2es-examples-dmcity-content.You will need Declarative Mapper deployed to xmi2es-examples-dmcity-modules. - -Alternatively, if it resides in a different modules DB in the instance, change the line below: -"modules": xdmp.database("xmi2es-examples-dmcity-modules"), -*/ - -function applyTemplate(mappingName, entity, sourceDocs) { - var cmd = ""; - cmd += "const dm = require('/ext/declarative-mapper.sjs');\n"; - cmd += "declareUpdate();\n"; - cmd += "const config = cts.doc('/dm/mapper/" + mappingName + "/" + entity + ".xml');\n"; - cmd += "const context = dm.newCompilerContext(config);\n"; - cmd += "var mapper = dm.prepare(context);\n"; - cmd += "for (const sourceDoc of sourceDocs) {\n"; - cmd += " var targetDoc = mapper(sourceDoc);\n"; - cmd += " var uri = '/target/" + entity + "/' + targetDoc.xpath('//name/text()') + '_' + targetDoc.xpath('//countryName/text()') + '.xml';\n"; - cmd += " xdmp.documentInsert(uri, targetDoc, {collections: ['target']});\n"; - cmd += "}\n"; - - xdmp.log(cmd, "info"); - xdmp.eval(cmd, { - "sourceDocs" : sourceDocs - }, { - "modules": xdmp.database("xmi2es-examples-dmcity-modules"), - "database": xdmp.database("xmi2es-examples-dmcity-content"), - "update": "auto" - }); -} - -var funs = cts.search(cts.collectionQuery("funbase")); -applyTemplate("funbase", "City", funs); - -var popdocs = Sequence.from(cts.doc('/population.json').root); -applyTemplate("dmdemo", "City", popdocs); - -'use strict'; - -/* -Let's look at one target of the mapping per mapping type. -You will need Declarative Mapper deployed to xmi2es-examples-dmcity-modules -*/ - -[ - "fundemo", - cts.doc("/target/City/US Flag_Moon.xml"), - "dmdemo", - cts.doc("/target/City/ACCRA_Ghana.xml") -] -xquery version "1.0-ml"; - -import module namespace es = "http://marklogic.com/entity-services" - at "/MarkLogic/entity-services/entity-services.xqy"; -import module namespace sem = "http://marklogic.com/semantics" - at "/MarkLogic/semantics.xqy"; - -(: -Through introspection of the model, generate mapper templates. This is the germ of a generic generation capability. -Make sure your database is xmi2es-examples-dmcity-content. -:) - -let $xes := <xesTriples>{sem:rdf-parse(fn:doc("/xmi2es/extension/DeclarativeCity.ttl"), ("turtle"))}</xesTriples> -let $esModel := es:model-to-xml(fn:doc("/xmi2es/es/DeclarativeCity.json")) -let $baseIRI := concat($esModel//es:info/es:base-uri/text(), "/", - $esModel//es:info/es:title/text(), "-", - $esModel//es:info/es:version/text()) -for $entity in $esModel//es:definitions/* return - let $entityName := string($entity/fn:node-name(.)) - let $entityIRI := concat($baseIRI, "/", $entityName) - let $xmlns := string($entity/es:namespace) - let $mapperNames := for $name in $xes//sem:triple[sem:subject/text() eq $entityIRI and - sem:predicate/text() eq "http://marklogic.com/xmi2es/xes/hasMapper"]/sem:object/text() return fn:tokenize($name, "/")[last()] - for $mapperName in $mapperNames return - let $mapperURI := concat("/dm/mapper/", $mapperName, "/", $entityName, ".xml") - let $attribMappingPred := concat("http://marklogic.com/xmi2es/xes/mapper", "/", $mapperName) - let $mapper := - element {fn:QName("http://marklogic.com/declarative-mapper", "config")} {( - element {fn:QName("http://marklogic.com/declarative-mapper", "format")} {"XML"}, - element {fn:QName("http://marklogic.com/declarative-mapper", "template")} { - element {fn:QName($xmlns, $entityName)} { - for $attribName in $entity/es:properties/*/fn:node-name(.) - let $attribIRI := concat($entityIRI, "/", $attribName) - let $attribMapping := string($xes//sem:triple[sem:subject/text() eq $attribIRI and - sem:predicate/text() eq $attribMappingPred]/sem:object) - return - if (string-length($attribMapping) gt 0) then - element {$attribName} {$attribMapping} - else () - } - })} - return xdmp:document-insert($mapperURI, $mapper, - <options xmlns="xdmp:document-insert"> - <collections> - <collection>mapper</collection> - </collections> - </options>) - diff --git a/uml2es/examples/declarativeCity/build.gradle b/uml2es/examples/declarativeCity/build.gradle deleted file mode 100644 index 1610a8e..0000000 --- a/uml2es/examples/declarativeCity/build.gradle +++ /dev/null @@ -1,134 +0,0 @@ -buildscript { - - repositories { - jcenter{url "http://jcenter.bintray.com/"} - mavenLocal() - maven { url "http://plugins.gradle.org/m2" } - } - dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" - classpath "net.saliman:gradle-properties-plugin:1.4.6" - } -} - -apply plugin: "net.saliman.properties" -apply plugin: "com.marklogic.ml-gradle" - -repositories { - jcenter{url "http://jcenter.bintray.com/"} - - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } - - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } -} - -configurations { - // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want - // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as - // shown below. Need to force to use certain version of xml-apis library. - mlcp { - resolutionStrategy { - force "xml-apis:xml-apis:1.4.01" - } - } -} - -dependencies { - mlcp "com.marklogic:mlcp:9.0.6" - mlcp "org.apache.commons:commons-csv:1.2" - mlcp files("lib") -} - -task loadPopulation(type: com.marklogic.gradle.task.MlcpTask) { - def xmiDir = new File("${projectDir}").getAbsolutePath() + "/data/source/dmdemo" - def unixDir = xmiDir.replace('\\', '/'); - def regex = '"' + unixDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - document_type = "json" - input_file_path = xmiDir + "/population.json" - input_file_type = "documents" - output_uri_replace = regex - output_uri_prefix = "/" - output_permissions = "rest-reader,read,rest-writer,update" - output_collections = "dmdemo" - host = mlHost - port = mlAppServicesPort.toInteger() -} - -task loadCountries(type: com.marklogic.gradle.task.MlcpTask) { - def xmiDir = new File("${projectDir}").getAbsolutePath() + "/data/source/dmdemo" - def unixDir = xmiDir.replace('\\', '/'); - def regex = '"' + unixDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - document_type = "json" - input_file_path = xmiDir + "/countries.json" - input_file_type = "documents" - output_uri_replace = regex - output_uri_prefix = "/" - output_permissions = "rest-reader,read,rest-writer,update" - output_collections = "dmdemo" - host = mlHost - port = mlAppServicesPort.toInteger() -} - - -task loadFunbase(type: com.marklogic.gradle.task.MlcpTask) { - def xmiDir = new File("${projectDir}").getAbsolutePath() + "/data/source/funbase" - def unixDir = xmiDir.replace('\\', '/'); - def regex = '"' + unixDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - document_type = "json" - input_file_path = xmiDir + "/funbase_cities.csv" - input_file_type ="delimited_text" - - output_collections= "funbase" - output_permissions= "rest-reader,read,rest-writer,update" - output_uri_replace=regex - output_uri_prefix = "/" - output_uri_suffix = ".json" - - host = mlHost - port = mlAppServicesPort.toInteger() -} - -task loadSources() { - dependsOn "loadPopulation" - dependsOn "loadCountries" - dependsOn "loadFunbase" -} - -task includeXMI2ESTransform(type: Copy) { - from "../../uml2esTransform/src/main/ml-modules/root/xmi2es" - into "src/main/ml-modules/root/xmi2es" -} - -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/DeclarativeCity.xml" - into "data/model" -} - -task includeUGradle() { - // Don't use Copy task bcuz file locking into gradle project dir on Windows - doLast { - copy { - from "../../uml2esTransform/uml2es.gradle" - into "." - } - } -} - -task setup() { - dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') - dependsOn('includeUGradle') -} diff --git a/uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.notation b/uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.notation deleted file mode 100644 index 63f480c..0000000 --- a/uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.notation +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.uml b/uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.uml deleted file mode 100644 index a078cd0..0000000 --- a/uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.uml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - mapper:dmdemo,"""[[extract('name')]]""" - mapper:funbase,"""[[extract('city_name')]]""" - - - mapper:dmdemo,"""[[extract('country')]]""" - - - mapper:dmdemo,"""[[extract('population') * 1000 ]]""" - - - mapper:dmdemo,"""[[extract('metroPopulation') * 1000 ]]""" - - - mapper:dmdemo,"""[[if((@'population' / @'metro-population') > 0.75, 'dense', 'sparse')]]""" - - - mapper:dmdemo,"""[[lookup('/countries.json', extract('country'), coalesce(@language, 'en'))]]""" - mapper:funbase,"""[[extract('country')]]""" - - - xes:hasMapper,mapper:dmdemo - xes:hasMapper,mapper:funbase - - - - xes,http://marklogic.com/xmi2es/xes/ - mapper,http://marklogic.com/xmi2es/xes/mapper/ - - diff --git a/uml2es/examples/declarativeCity/data/source/dmdemo/countries.json b/uml2es/examples/declarativeCity/data/source/dmdemo/countries.json deleted file mode 100644 index 386ed8f..0000000 --- a/uml2es/examples/declarativeCity/data/source/dmdemo/countries.json +++ /dev/null @@ -1,2492 +0,0 @@ -{ - "AD": { - "de": "Andorra", - "en": "Andorra", - "es": "Andorra", - "fr": "Andorre", - "ja": "アンドラ", - "pt-BR": "Andorra", - "ru": "Андорра", - "zh-CN": "安道尔" - }, - "AE": { - "de": "Vereinigte Arabische Emirate", - "en": "United Arab Emirates", - "es": "Emiratos Árabes Unidos", - "fr": "Émirats Arabes Unis", - "ja": "アラブ首長国連邦", - "pt-BR": "Emirados Árabes Unidos", - "ru": "ОАЭ", - "zh-CN": "阿拉伯联合酋长国" - }, - "AF": { - "de": "Afghanistan", - "en": "Afghanistan", - "es": "Afganistán", - "fr": "Afghanistan", - "ja": "アフガニスタン・イスラム国", - "pt-BR": "Afeganistão", - "ru": "Афганистан", - "zh-CN": "阿富汗" - }, - "AG": { - "de": "Antigua und Barbuda", - "en": "Antigua and Barbuda", - "es": "Antigua y Barbuda", - "fr": "Antigua et Barbuda", - "ja": "アンティグア・バーブーダ", - "pt-BR": "Antígua e Barbuda", - "ru": "Антигуа и Барбуда", - "zh-CN": "安提瓜和巴布达" - }, - "AI": { - "de": "Anguilla", - "en": "Anguilla", - "es": "Anguila", - "fr": "Anguilla", - "ja": "アンギラ", - "pt-BR": "Anguilla", - "ru": "Ангилья", - "zh-CN": "安圭拉" - }, - "AL": { - "de": "Albanien", - "en": "Albania", - "es": "Albania", - "fr": "Albanie", - "ja": "アルバニア共和国", - "pt-BR": "Albânia", - "ru": "Албания", - "zh-CN": "阿尔巴尼亚" - }, - "AM": { - "de": "Armenien", - "en": "Armenia", - "es": "Armenia", - "fr": "Arménie", - "ja": "アルメニア共和国", - "pt-BR": "Armênia", - "ru": "Армения", - "zh-CN": "亚美尼亚" - }, - "AO": { - "de": "Angola", - "en": "Angola", - "es": "Angola", - "fr": "Angola", - "ja": "アンゴラ共和国", - "pt-BR": "Angola", - "ru": "Ангола", - "zh-CN": "安哥拉" - }, - "AQ": { - "de": "Antarktis", - "en": "Antarctica", - "es": "Antártida", - "fr": "Antarctique", - "ja": "南極", - "pt-BR": "Antártida", - "ru": "Антарктида", - "zh-CN": "南极洲" - }, - "AR": { - "de": "Argentinien", - "en": "Argentina", - "es": "Argentina", - "fr": "Argentine", - "ja": "アルゼンチン共和国", - "pt-BR": "Argentina", - "ru": "Аргентина", - "zh-CN": "阿根廷" - }, - "AS": { - "de": "Amerikanisch-Samoa", - "en": "American Samoa", - "es": "Samoa Americana", - "fr": "Samoa américaines", - "ja": "米領サモア", - "pt-BR": "Samoa Americana", - "ru": "Американское Самоа", - "zh-CN": "美属萨摩亚" - }, - "AT": { - "de": "Österreich", - "en": "Austria", - "es": "Austria", - "fr": "Autriche", - "ja": "オーストリア共和国", - "pt-BR": "Áustria", - "ru": "Австрия", - "zh-CN": "奥地利" - }, - "AU": { - "de": "Australien", - "en": "Australia", - "es": "Australia", - "fr": "Australie", - "ja": "オーストラリア", - "pt-BR": "Austrália", - "ru": "Австралия", - "zh-CN": "澳大利亚" - }, - "AW": { - "de": "Aruba", - "en": "Aruba", - "es": "Aruba", - "fr": "Aruba", - "ja": "アルバ島", - "pt-BR": "Aruba", - "ru": "Аруба", - "zh-CN": "阿鲁巴" - }, - "AX": { - "de": "Alandinseln", - "en": "Åland", - "es": "Islas de Åland", - "fr": "Îles Åland", - "ja": "オーランド諸島", - "pt-BR": "Alanda", - "ru": "Аланды", - "zh-CN": "奥兰群岛" - }, - "AZ": { - "de": "Aserbaidschan", - "en": "Azerbaijan", - "es": "Azerbaiyán", - "fr": "Azerbaïdjan", - "ja": "アゼルバイジャン共和国", - "pt-BR": "Azerbaijão", - "ru": "Азербайджан", - "zh-CN": "阿塞拜疆" - }, - "BA": { - "de": "Bosnien und Herzegowina", - "en": "Bosnia and Herzegovina", - "es": "Bosnia-Herzegovina", - "fr": "Bosnie-Herzégovine", - "ja": "ボスニア・ヘルツェゴビナ共和国", - "pt-BR": "Bósnia-Herzegóvina", - "ru": "Босния", - "zh-CN": "波斯尼亚和黑山共和国" - }, - "BB": { - "de": "Barbados", - "en": "Barbados", - "es": "Barbados", - "fr": "Barbade", - "ja": "バルバドス", - "pt-BR": "Barbados", - "ru": "Барбадос", - "zh-CN": "巴巴多斯" - }, - "BD": { - "de": "Bangladesch", - "en": "Bangladesh", - "es": "Bangladesh", - "fr": "Bangladesh", - "ja": "バングラディッシュ人民共和国", - "pt-BR": "Bangladexe", - "ru": "Бангладеш", - "zh-CN": "孟加拉" - }, - "BE": { - "de": "Belgien", - "en": "Belgium", - "es": "Bélgica", - "fr": "Belgique", - "ja": "ベルギー王国", - "pt-BR": "Bélgica", - "ru": "Бельгия", - "zh-CN": "比利时" - }, - "BF": { - "de": "Burkina Faso", - "en": "Burkina Faso", - "es": "Burkina Faso", - "fr": "Burkina Faso", - "ja": "ブルキナファソ", - "pt-BR": "Burkina Fasso", - "ru": "Буркина Фасо", - "zh-CN": "布基纳法索" - }, - "BG": { - "de": "Bulgarien", - "en": "Bulgaria", - "es": "Bulgaria", - "fr": "Bulgarie", - "ja": "ブルガリア共和国", - "pt-BR": "Bulgária", - "ru": "Болгария", - "zh-CN": "保加利亚" - }, - "BH": { - "de": "Bahrain", - "en": "Bahrain", - "es": "Bahréin", - "fr": "Bahreïn", - "ja": "バーレーン", - "pt-BR": "Bahrain", - "ru": "Бахрейн", - "zh-CN": "巴林" - }, - "BI": { - "de": "Burundi", - "en": "Burundi", - "es": "Burundi", - "fr": "Burundi", - "ja": "ブルンジ共和国", - "pt-BR": "Burundi", - "ru": "Бурунди", - "zh-CN": "布隆迪" - }, - "BJ": { - "de": "Benin", - "en": "Benin", - "es": "Benín", - "fr": "Bénin", - "ja": "ベニン共和国", - "pt-BR": "Benin", - "ru": "Бенин", - "zh-CN": "贝宁" - }, - "BL": { - "de": "St. Barthélemy", - "en": "Saint-Barthélemy", - "es": "San Bartolomé", - "fr": "Saint-Barthélémy", - "ja": "サン・バルテルミー", - "pt-BR": "São Bartolomeu", - "ru": "Остров Святого Бартоломея", - "zh-CN": "圣巴泰勒米" - }, - "BM": { - "de": "Bermuda", - "en": "Bermuda", - "es": "Bermudas", - "fr": "Bermudes", - "ja": "バミューダ諸島", - "pt-BR": "Bermudas", - "ru": "Бермудские о-ва", - "zh-CN": "百慕大" - }, - "BN": { - "de": "Brunei", - "en": "Brunei", - "es": "Brunéi", - "fr": "Brunéi Darussalam", - "ja": "ブルネイ", - "pt-BR": "Brunei", - "ru": "Бруней Даруссалам", - "zh-CN": "文莱" - }, - "BO": { - "de": "Bolivien", - "en": "Bolivia", - "es": "Bolivia", - "fr": "Bolivie", - "ja": "ボリビア共和国", - "pt-BR": "Bolívia", - "ru": "Боливия", - "zh-CN": "玻利维亚" - }, - "BQ": { - "de": "Bonaire", - "en": "Bonaire, Sint Eustatius, and Saba", - "es": "Bonaire", - "fr": "Bonaire, Saint-Eustache et Saba", - "ja": "ボネール、シント・ユースタティウスおよびサバ", - "pt-BR": "Bonaire", - "ru": "Бонайре, Синт-Эстатиус и Саба", - "zh-CN": "博奈尔岛、圣尤斯达蒂斯和萨巴" - }, - "BR": { - "de": "Brasilien", - "en": "Brazil", - "es": "Brasil", - "fr": "Brésil", - "ja": "ブラジル連邦共和国", - "pt-BR": "Brasil", - "ru": "Бразилия", - "zh-CN": "巴西" - }, - "BS": { - "de": "Bahamas", - "en": "Bahamas", - "es": "Bahamas", - "fr": "Bahamas", - "ja": "バハマ国", - "pt-BR": "Bahamas", - "ru": "Багамы", - "zh-CN": "巴哈马" - }, - "BT": { - "de": "Bhutan", - "en": "Bhutan", - "es": "Bután", - "fr": "Bhoutan", - "ja": "ブータン王国", - "pt-BR": "Butão", - "ru": "Бутан", - "zh-CN": "不丹" - }, - "BW": { - "de": "Botswana", - "en": "Botswana", - "es": "Botsuana", - "fr": "Botswana", - "ja": "ボツワナ共和国", - "pt-BR": "Botsuana", - "ru": "Ботсвана", - "zh-CN": "博茨瓦纳" - }, - "BY": { - "de": "Weißrussland", - "en": "Belarus", - "es": "Bielorrusia", - "fr": "Biélorussie", - "ja": "ベラルーシ共和国", - "pt-BR": "Bielo-Rússia", - "ru": "Беларусь", - "zh-CN": "白俄罗斯" - }, - "BZ": { - "de": "Belize", - "en": "Belize", - "es": "Belice", - "fr": "Belize", - "ja": "ベリーズ", - "pt-BR": "Belize", - "ru": "Белиз", - "zh-CN": "伯利兹" - }, - "CA": { - "de": "Kanada", - "en": "Canada", - "es": "Canadá", - "fr": "Canada", - "ja": "カナダ", - "pt-BR": "Canadá", - "ru": "Канада", - "zh-CN": "加拿大" - }, - "CC": { - "de": "Kokosinseln", - "en": "Cocos [Keeling] Islands", - "es": "Islas Cocos", - "fr": "Îles Cocos", - "ja": "ココス[キーリング]諸島", - "pt-BR": "Ilhas Coco", - "ru": "Кокосовые о-ва", - "zh-CN": "科科斯群岛" - }, - "CD": { - "de": "Kongo", - "en": "Congo", - "es": "Congo Democrático", - "fr": "RDC", - "ja": "コンゴ民主共和国", - "pt-BR": "Congo-Kinshasa", - "ru": "Заир", - "zh-CN": "扎伊尔" - }, - "CF": { - "de": "Zentralafrikanische Republik", - "en": "Central African Republic", - "es": "República Centroafricana", - "fr": "Centrafrique", - "ja": "中央アフリカ共和国", - "pt-BR": "República Centro-Africana", - "ru": "ЦАР", - "zh-CN": "中非共和国" - }, - "CG": { - "de": "Kongo (Republik Kongo)", - "en": "Republic of the Congo", - "es": "Congo [República]", - "fr": "Congo-Brazzaville", - "ja": "コンゴ共和国", - "pt-BR": "Congo", - "ru": "Конго", - "zh-CN": "刚果" - }, - "CH": { - "de": "Schweiz", - "en": "Switzerland", - "es": "Suiza", - "fr": "Suisse", - "ja": "スイス連邦", - "pt-BR": "Suíça", - "ru": "Швейцария", - "zh-CN": "瑞士" - }, - "CI": { - "de": "Elfenbeinküste", - "en": "Ivory Coast", - "es": "Costa de Marfil", - "fr": "Côte d'Ivoire", - "ja": "象牙海岸", - "pt-BR": "Costa do Marfim", - "ru": "Кот-д'Ивуар", - "zh-CN": "象牙海岸" - }, - "CK": { - "de": "Cookinseln", - "en": "Cook Islands", - "es": "Islas Cook", - "fr": "Îles Cook", - "ja": "クック諸島", - "pt-BR": "Ilhas Cook", - "ru": "Острова Кука", - "zh-CN": "库克群岛" - }, - "CL": { - "de": "Chile", - "en": "Chile", - "es": "Chile", - "fr": "Chili", - "ja": "チリ共和国", - "pt-BR": "Chile", - "ru": "Чили", - "zh-CN": "智利" - }, - "CM": { - "de": "Kamerun", - "en": "Cameroon", - "es": "Camerún", - "fr": "Cameroun", - "ja": "カメルーン共和国", - "pt-BR": "Camarões", - "ru": "Камерун", - "zh-CN": "喀麦隆" - }, - "CN": { - "de": "China", - "en": "China", - "es": "China", - "fr": "Chine", - "ja": "中国", - "pt-BR": "China", - "ru": "Китай", - "zh-CN": "中国" - }, - "CO": { - "de": "Kolumbien", - "en": "Colombia", - "es": "Colombia", - "fr": "Colombie", - "ja": "コロンビア共和国", - "pt-BR": "Colômbia", - "ru": "Колумбия", - "zh-CN": "哥伦比亚" - }, - "CR": { - "de": "Costa Rica", - "en": "Costa Rica", - "es": "Costa Rica", - "fr": "Costa Rica", - "ja": "コスタリカ", - "pt-BR": "Costa Rica", - "ru": "Коста-Рика", - "zh-CN": "哥斯达黎加" - }, - "CU": { - "de": "Kuba", - "en": "Cuba", - "es": "Cuba", - "fr": "Cuba", - "ja": "キューバ共和国", - "pt-BR": "Cuba", - "ru": "Куба", - "zh-CN": "古巴" - }, - "CV": { - "de": "Kapverden", - "en": "Cabo Verde", - "es": "Cabo Verde", - "fr": "Cap-Vert", - "ja": "カーボベルデ", - "pt-BR": "Cabo Verde", - "ru": "Острова Зеленого Мыса", - "zh-CN": "佛得角" - }, - "CW": { - "de": "Curaçao", - "en": "Curaçao", - "es": "Curazao", - "fr": "Curaçao", - "ja": "キュラソー", - "pt-BR": "Curaçao", - "ru": "Кюрасао", - "zh-CN": "库拉索" - }, - "CX": { - "de": "Weihnachtsinsel", - "en": "Christmas Island", - "es": "Isla Christmas", - "fr": "Île Christmas", - "ja": "クリスマス島", - "pt-BR": "Ilhas Natal", - "ru": "Остров Рождества", - "zh-CN": "圣诞岛" - }, - "CY": { - "de": "Zypern", - "en": "Cyprus", - "es": "Chipre", - "fr": "Chypre", - "ja": "キプロス共和国", - "pt-BR": "Chipre", - "ru": "Кипр", - "zh-CN": "塞浦路斯" - }, - "CZ": { - "de": "Tschechien", - "en": "Czechia", - "es": "República Checa", - "fr": "République tchèque", - "ja": "チェコ共和国", - "pt-BR": "Tchéquia", - "ru": "Чешская Республика", - "zh-CN": "捷克共和国" - }, - "DE": { - "de": "Deutschland", - "en": "Germany", - "es": "Alemania", - "fr": "Allemagne", - "ja": "ドイツ連邦共和国", - "pt-BR": "Alemanha", - "ru": "Германия", - "zh-CN": "德国" - }, - "DJ": { - "de": "Dschibuti", - "en": "Djibouti", - "es": "Yibuti", - "fr": "Djibouti", - "ja": "ジブチ", - "pt-BR": "Djibuti", - "ru": "Джибути", - "zh-CN": "吉布提" - }, - "DK": { - "de": "Dänemark", - "en": "Denmark", - "es": "Dinamarca", - "fr": "Danemark", - "ja": "デンマーク王国", - "pt-BR": "Dinamarca", - "ru": "Дания", - "zh-CN": "丹麦" - }, - "DM": { - "de": "Dominica", - "en": "Dominica", - "es": "Dominica", - "fr": "Dominique", - "ja": "ドミニカ国", - "pt-BR": "Dominica", - "ru": "Остров Доминика", - "zh-CN": "多米尼加" - }, - "DO": { - "de": "Dom. Republik", - "en": "Dominican Republic", - "es": "República Dominicana", - "fr": "République Dominicaine", - "ja": "ドミニカ共和国", - "pt-BR": "República Dominicana", - "ru": "Доминиканская Республика", - "zh-CN": "多米尼加共和国" - }, - "DZ": { - "de": "Algerien", - "en": "Algeria", - "es": "Argelia", - "fr": "Algérie", - "ja": "アルジェリア民主人民共和国", - "pt-BR": "Argélia", - "ru": "Алжир", - "zh-CN": "阿尔及利亚" - }, - "EC": { - "de": "Ecuador", - "en": "Ecuador", - "es": "Ecuador", - "fr": "Équateur", - "ja": "エクアドル共和国", - "pt-BR": "Equador", - "ru": "Эквадор", - "zh-CN": "厄瓜多尔" - }, - "EE": { - "de": "Estland", - "en": "Estonia", - "es": "Estonia", - "fr": "Estonie", - "ja": "エストニア共和国", - "pt-BR": "Estônia", - "ru": "Эстония", - "zh-CN": "爱沙尼亚" - }, - "EG": { - "de": "Ägypten", - "en": "Egypt", - "es": "Egipto", - "fr": "Égypte", - "ja": "エジプト・アラブ共和国", - "pt-BR": "Egito", - "ru": "Египет", - "zh-CN": "埃及" - }, - "EH": { - "de": "Westsahara", - "en": "Western Sahara", - "es": "Sáhara Occidental", - "fr": "Sahara Occidental", - "ja": "西サハラ", - "pt-BR": "Saara Ocidental", - "ru": "Западная Сахара", - "zh-CN": "西撒哈拉" - }, - "ER": { - "de": "Eritrea", - "en": "Eritrea", - "es": "Eritrea", - "fr": "Érythrée", - "ja": "エリトリア", - "pt-BR": "Eritreia", - "ru": "Эритрея", - "zh-CN": "厄立特里亚" - }, - "ES": { - "de": "Spanien", - "en": "Spain", - "es": "España", - "fr": "Espagne", - "ja": "スペイン", - "pt-BR": "Espanha", - "ru": "Испания", - "zh-CN": "西班牙" - }, - "ET": { - "de": "Äthiopien", - "en": "Ethiopia", - "es": "Etiopía", - "fr": "Éthiopie", - "ja": "エチオピア", - "pt-BR": "Etiópia", - "ru": "Эфиопия", - "zh-CN": "埃塞俄比亚" - }, - "FI": { - "de": "Finnland", - "en": "Finland", - "es": "Finlandia", - "fr": "Finlande", - "ja": "フィンランド共和国", - "pt-BR": "Finlândia", - "ru": "Финляндия", - "zh-CN": "芬兰" - }, - "FJ": { - "de": "Fidschi", - "en": "Fiji", - "es": "Fiyi", - "fr": "Fidji", - "ja": "フィジー", - "pt-BR": "Fiji", - "ru": "Фиджи", - "zh-CN": "斐济" - }, - "FK": { - "de": "Falklandinseln", - "en": "Falkland Islands", - "es": "Islas Malvinas", - "fr": "Îles Malouines", - "ja": "フォークランド諸島", - "pt-BR": "Ilhas Malvinas", - "ru": "Фолклендские о-ва", - "zh-CN": "福克兰群岛" - }, - "FM": { - "de": "Mikronesien", - "en": "Federated States of Micronesia", - "es": "Micronesia", - "fr": "Micronésie", - "ja": "ミクロネシア連邦", - "pt-BR": "Micronésia", - "ru": "Микронезия", - "zh-CN": "密克罗尼西亚" - }, - "FO": { - "de": "Färöer-Inseln", - "en": "Faroe Islands", - "es": "Islas Feroe", - "fr": "Îles Féroé", - "ja": "フェロー諸島", - "pt-BR": "Ilhas Faroe", - "ru": "Фарерские о-ва", - "zh-CN": "法罗群岛" - }, - "FR": { - "de": "Frankreich", - "en": "France", - "es": "Francia", - "fr": "France", - "ja": "フランス共和国", - "pt-BR": "França", - "ru": "Франция", - "zh-CN": "法国" - }, - "GA": { - "de": "Gabun", - "en": "Gabon", - "es": "Gabón", - "fr": "Gabon", - "ja": "ガボン共和国", - "pt-BR": "Gabão", - "ru": "Габон", - "zh-CN": "加蓬" - }, - "GB": { - "de": "Vereinigtes Königreich", - "en": "United Kingdom", - "es": "Reino Unido", - "fr": "Royaume-Uni", - "ja": "イギリス", - "pt-BR": "Reino Unido", - "ru": "Великобритания", - "zh-CN": "英国" - }, - "GD": { - "de": "Grenada", - "en": "Grenada", - "es": "Granada", - "fr": "Grenade", - "ja": "グレナダ", - "pt-BR": "Granada", - "ru": "Гренада", - "zh-CN": "格林纳达" - }, - "GE": { - "de": "Georgien", - "en": "Georgia", - "es": "Georgia", - "fr": "Géorgie", - "ja": "グルジア共和国", - "pt-BR": "Geórgia", - "ru": "Грузия", - "zh-CN": "格鲁吉亚" - }, - "GF": { - "de": "Französisch-Guayana", - "en": "French Guiana", - "es": "Guayana Francesa", - "fr": "Guyane", - "ja": "仏領ギアナ", - "pt-BR": "Guiana Francesa", - "ru": "Французская Гвиана", - "zh-CN": "法属圭亚那" - }, - "GG": { - "de": "Guernsey", - "en": "Guernsey", - "es": "Guernsey", - "fr": "Guernesey", - "ja": "ガーンジー", - "pt-BR": "Guernsey", - "ru": "Гернси", - "zh-CN": "格恩西岛" - }, - "GH": { - "de": "Ghana", - "en": "Ghana", - "es": "Ghana", - "fr": "Ghana", - "ja": "ガーナ共和国", - "pt-BR": "Gana", - "ru": "Гана", - "zh-CN": "加纳" - }, - "GI": { - "de": "Gibraltar", - "en": "Gibraltar", - "es": "Gibraltar", - "fr": "Gibraltar", - "ja": "ジブラルタル", - "pt-BR": "Gibraltar", - "ru": "Гибралтар", - "zh-CN": "直布罗陀" - }, - "GL": { - "de": "Grönland", - "en": "Greenland", - "es": "Groenlandia", - "fr": "Groenland", - "ja": "グリーンランド", - "pt-BR": "Gronelândia", - "ru": "Гренландия", - "zh-CN": "格陵兰" - }, - "GM": { - "de": "Gambia", - "en": "Gambia", - "es": "Gambia", - "fr": "Gambie", - "ja": "ガンビア共和国", - "pt-BR": "Gâmbia", - "ru": "Гамбия", - "zh-CN": "冈比亚" - }, - "GN": { - "de": "Guinea", - "en": "Guinea", - "es": "Guinea", - "fr": "Guinée", - "ja": "ギニア共和国", - "pt-BR": "Guiné", - "ru": "Гвинея", - "zh-CN": "几内亚" - }, - "GP": { - "de": "Guadeloupe", - "en": "Guadeloupe", - "es": "Guadalupe", - "fr": "Guadeloupe", - "ja": "グアドループ", - "pt-BR": "Guadalupe", - "ru": "Гваделупа", - "zh-CN": "瓜德罗普岛" - }, - "GQ": { - "de": "Äquatorialguinea", - "en": "Equatorial Guinea", - "es": "Guinea Ecuatorial", - "fr": "Guinée équatoriale", - "ja": "赤道ギニア共和国", - "pt-BR": "Guiné Equatorial", - "ru": "Экваториальная Гвинея", - "zh-CN": "赤道几内亚" - }, - "GR": { - "de": "Griechenland", - "en": "Greece", - "es": "Grecia", - "fr": "Grèce", - "ja": "ギリシャ共和国", - "pt-BR": "Grécia", - "ru": "Греция", - "zh-CN": "希腊" - }, - "GS": { - "de": "Südgeorgien und die Südlichen Sandwichinseln", - "en": "South Georgia and the South Sandwich Islands", - "es": "Islas Georgia del Sur y Sandwich del Sur", - "fr": "Géorgie du Sud-et-les îles Sandwich du Sud", - "ja": "南ジョージア島・南サンドイッチ諸島", - "pt-BR": "Geórgia do Sul e Ilhas Sandwich do Sul", - "ru": "Южная Джорджия и Южные Сандвичевы Острова", - "zh-CN": "南乔治亚岛和南桑威齐群岛" - }, - "GT": { - "de": "Guatemala", - "en": "Guatemala", - "es": "Guatemala", - "fr": "Guatemala", - "ja": "グアテマラ", - "pt-BR": "Guatemala", - "ru": "Гватемала", - "zh-CN": "危地马拉" - }, - "GU": { - "de": "Guam", - "en": "Guam", - "es": "Guam", - "fr": "Guam", - "ja": "グアム", - "pt-BR": "Guam", - "ru": "Гуам", - "zh-CN": "关岛" - }, - "GW": { - "de": "Guinea-Bissau", - "en": "Guinea-Bissau", - "es": "Guinea-Bissáu", - "fr": "Guinée-Bissau", - "ja": "ギニアビサウ共和国", - "pt-BR": "República da Guiné-Bissau", - "ru": "Гвинея-Биссау", - "zh-CN": "几内亚比绍" - }, - "GY": { - "de": "Guyana", - "en": "Guyana", - "es": "Guyana", - "fr": "Guyana", - "ja": "ガイアナ", - "pt-BR": "Guiana", - "ru": "Гайана", - "zh-CN": "圭亚那" - }, - "HK": { - "de": "Hongkong", - "en": "Hong Kong", - "es": "Hong Kong", - "fr": "Hong Kong", - "ja": "香港", - "pt-BR": "Hong Kong", - "ru": "Гонконг", - "zh-CN": "香港" - }, - "HM": { - "de": "Heard- und McDonald-Inseln", - "en": "Heard Island and McDonald Islands", - "es": "Islas Heard y McDonald", - "fr": "Île Heard et îles McDonald", - "ja": "ハード島・マクドナルド諸島", - "pt-BR": "Ilha Heard e Ilhas McDonald", - "ru": "Острова Херд и Макдональд", - "zh-CN": "赫德与麦克唐纳群岛" - }, - "HN": { - "de": "Honduras", - "en": "Honduras", - "es": "Honduras", - "fr": "Honduras", - "ja": "ホンジュラス共和国", - "pt-BR": "Honduras", - "ru": "Гондурас", - "zh-CN": "洪都拉斯" - }, - "HR": { - "de": "Kroatien", - "en": "Croatia", - "es": "Croacia", - "fr": "Croatie", - "ja": "クロアチア共和国", - "pt-BR": "Croácia", - "ru": "Хорватия", - "zh-CN": "克罗地亚" - }, - "HT": { - "de": "Haiti", - "en": "Haiti", - "es": "Haití", - "fr": "Haïti", - "ja": "ハイチ共和国", - "pt-BR": "Haiti", - "ru": "Гаити", - "zh-CN": "海地" - }, - "HU": { - "de": "Ungarn", - "en": "Hungary", - "es": "Hungría", - "fr": "Hongrie", - "ja": "ハンガリー共和国", - "pt-BR": "Hungria", - "ru": "Венгрия", - "zh-CN": "匈牙利" - }, - "ID": { - "de": "Indonesien", - "en": "Indonesia", - "es": "Indonesia", - "fr": "Indonésie", - "ja": "インドネシア共和国", - "pt-BR": "Indonésia", - "ru": "Индонезия", - "zh-CN": "印度尼西亚" - }, - "IE": { - "de": "Irland", - "en": "Ireland", - "es": "Irlanda", - "fr": "Irlande", - "ja": "アイルランド", - "pt-BR": "Irlanda", - "ru": "Ирландия", - "zh-CN": "爱尔兰" - }, - "IL": { - "de": "Israel", - "en": "Israel", - "es": "Israel", - "fr": "Israël", - "ja": "イスラエル国", - "pt-BR": "Israel", - "ru": "Израиль", - "zh-CN": "以色列" - }, - "IM": { - "de": "Insel Man", - "en": "Isle of Man", - "es": "Isla de Man", - "fr": "Île de Man", - "ja": "マン島", - "pt-BR": "Ilha de Man", - "ru": "Мэн, о-в", - "zh-CN": "曼岛" - }, - "IN": { - "de": "Indien", - "en": "India", - "es": "India", - "fr": "Inde", - "ja": "インド", - "pt-BR": "Índia", - "ru": "Индия", - "zh-CN": "印度" - }, - "IO": { - "de": "Britisches Territorium im Indischen Ozean", - "en": "British Indian Ocean Territory", - "es": "Territorio Británico del Océano Índico", - "fr": "Territoire britannique de l'océan Indien", - "ja": "英領インド洋地域", - "pt-BR": "Território Britânico do Oceano Índico", - "ru": "Британская территория в Индийском океане", - "zh-CN": "英属印度洋领地" - }, - "IQ": { - "de": "Irak", - "en": "Iraq", - "es": "Irak", - "fr": "Irak", - "ja": "イラク共和国", - "pt-BR": "Iraque", - "ru": "Ирак", - "zh-CN": "伊拉克" - }, - "IR": { - "de": "Iran (Islamische Republik)", - "en": "Iran", - "es": "Irán", - "fr": "Iran", - "ja": "イラン・イスラム共和国", - "pt-BR": "Irã", - "ru": "Иран", - "zh-CN": "伊朗伊斯兰共和国" - }, - "IS": { - "de": "Island", - "en": "Iceland", - "es": "Islandia", - "fr": "Islande", - "ja": "アイスランド共和国", - "pt-BR": "Islândia", - "ru": "Исландия", - "zh-CN": "冰岛" - }, - "IT": { - "de": "Italien", - "en": "Italy", - "es": "Italia", - "fr": "Italie", - "ja": "イタリア共和国", - "pt-BR": "Itália", - "ru": "Италия", - "zh-CN": "意大利" - }, - "JE": { - "de": "Jersey", - "en": "Jersey", - "es": "Jersey", - "fr": "Jersey", - "ja": "ジャージー", - "pt-BR": "Jersey", - "ru": "Джерси", - "zh-CN": "泽西岛" - }, - "JM": { - "de": "Jamaika", - "en": "Jamaica", - "es": "Jamaica", - "fr": "Jamaïque", - "ja": "ジャマイカ", - "pt-BR": "Jamaica", - "ru": "Ямайка", - "zh-CN": "牙买加" - }, - "JO": { - "de": "Jordanien", - "en": "Hashemite Kingdom of Jordan", - "es": "Jordania", - "fr": "Jordanie", - "ja": "ヨルダン・ハシミテ王国", - "pt-BR": "Jordânia", - "ru": "Иордания", - "zh-CN": "约旦" - }, - "JP": { - "de": "Japan", - "en": "Japan", - "es": "Japón", - "fr": "Japon", - "ja": "日本", - "pt-BR": "Japão", - "ru": "Япония", - "zh-CN": "日本" - }, - "KE": { - "de": "Kenia", - "en": "Kenya", - "es": "Kenia", - "fr": "Kenya", - "ja": "ケニア共和国", - "pt-BR": "Quênia", - "ru": "Кения", - "zh-CN": "肯尼亚" - }, - "KG": { - "de": "Kirgistan", - "en": "Kyrgyzstan", - "es": "Kirguistán", - "fr": "Kirghizistan", - "ja": "キルギス共和国", - "pt-BR": "Quirguistão", - "ru": "Кыргызстан", - "zh-CN": "吉尔吉克斯坦" - }, - "KH": { - "de": "Kambodscha", - "en": "Cambodia", - "es": "Camboya", - "fr": "Cambodge", - "ja": "カンボジア国", - "pt-BR": "Camboja", - "ru": "Камбоджа", - "zh-CN": "柬埔寨" - }, - "KI": { - "de": "Kiribati", - "en": "Kiribati", - "es": "Kiribati", - "fr": "Kiribati", - "ja": "キリバス共和国", - "pt-BR": "Quiribati", - "ru": "Кирибати", - "zh-CN": "基里巴斯" - }, - "KM": { - "de": "Komoren", - "en": "Comoros", - "es": "Comoras", - "fr": "Comores", - "ja": "コモロ・イスラム連邦共和国", - "pt-BR": "Ilhas Comores", - "ru": "Коморские о-ва", - "zh-CN": "科摩罗" - }, - "KN": { - "de": "Saint Kitts und Nevis", - "en": "St Kitts and Nevis", - "es": "San Cristóbal y Nieves", - "fr": "Saint-Christophe-et-Niévès", - "ja": "セントクリストファー・ネビス", - "pt-BR": "São Cristóvão e Névis", - "ru": "Сент-Киттс и Невис", - "zh-CN": "圣基茨和尼维斯" - }, - "KP": { - "de": "Nordkorea", - "en": "North Korea", - "es": "Corea del Norte", - "fr": "Corée du Nord", - "ja": "韓国、朝鮮民主主義人民共和国", - "pt-BR": "Coreia do Norte", - "ru": "Северная Корея", - "zh-CN": "朝鲜民主共和国" - }, - "KR": { - "de": "Südkorea", - "en": "Republic of Korea", - "es": "Corea del Sur", - "fr": "Corée du Sud", - "ja": "大韓民国", - "pt-BR": "Coreia do Sul", - "ru": "Южная Корея", - "zh-CN": "大韩民国" - }, - "KW": { - "de": "Kuwait", - "en": "Kuwait", - "es": "Kuwait", - "fr": "Koweït", - "ja": "クウェート", - "pt-BR": "Kuwait", - "ru": "Кувейт", - "zh-CN": "科威特" - }, - "KY": { - "de": "Kaimaninseln", - "en": "Cayman Islands", - "es": "Islas Caimán", - "fr": "Îles Caïmans", - "ja": "ケイマン諸島", - "pt-BR": "Ilhas Caiman", - "ru": "Каймановы Острова", - "zh-CN": "开曼群岛" - }, - "KZ": { - "de": "Kasachstan", - "en": "Kazakhstan", - "es": "Kazajstán", - "fr": "Kazakhstan", - "ja": "カザフスタン共和国", - "pt-BR": "Cazaquistão", - "ru": "Казахстан", - "zh-CN": "哈萨克斯坦" - }, - "LA": { - "de": "Laos", - "en": "Laos", - "es": "Laos", - "fr": "Laos", - "ja": "ラオス", - "pt-BR": "República Popular Democrática do Laos", - "ru": "Лаос", - "zh-CN": "老挝人民民主共和国" - }, - "LB": { - "de": "Libanon", - "en": "Lebanon", - "es": "Líbano", - "fr": "Liban", - "ja": "レバノン共和国", - "pt-BR": "Líbano", - "ru": "Ливан", - "zh-CN": "黎巴嫩" - }, - "LC": { - "de": "St. Lucia", - "en": "Saint Lucia", - "es": "Santa Lucía", - "fr": "Sainte-Lucie", - "ja": "セントルシア", - "pt-BR": "Santa Lúcia", - "ru": "Сент-Люсия", - "zh-CN": "圣卢西亚" - }, - "LI": { - "de": "Liechtenstein", - "en": "Liechtenstein", - "es": "Liechtenstein", - "fr": "Liechtenstein", - "ja": "リヒテンシュタイン公国", - "pt-BR": "Lichtenstein", - "ru": "Лихтенштейн", - "zh-CN": "列支敦士登" - }, - "LK": { - "de": "Sri Lanka", - "en": "Sri Lanka", - "es": "Sri Lanka", - "fr": "Sri Lanka", - "ja": "スリランカ民主社会主義共和国", - "pt-BR": "Sri Lanka", - "ru": "Шри-Ланка", - "zh-CN": "斯里兰卡" - }, - "LR": { - "de": "Liberia", - "en": "Liberia", - "es": "Liberia", - "fr": "Liberia", - "ja": "リベリア共和国", - "pt-BR": "Libéria", - "ru": "Либерия", - "zh-CN": "利比里亚" - }, - "LS": { - "de": "Lesotho", - "en": "Lesotho", - "es": "Lesotho", - "fr": "Lesotho", - "ja": "レソト王国", - "pt-BR": "Lesoto", - "ru": "Лесото", - "zh-CN": "莱索托" - }, - "LT": { - "de": "Litauen", - "en": "Republic of Lithuania", - "es": "Lituania", - "fr": "Lituanie", - "ja": "リトアニア共和国", - "pt-BR": "Lituânia", - "ru": "Литва", - "zh-CN": "立陶宛" - }, - "LU": { - "de": "Luxemburg", - "en": "Luxembourg", - "es": "Luxemburgo", - "fr": "Luxembourg", - "ja": "ルクセンブルグ", - "pt-BR": "Luxemburgo", - "ru": "Люксембург", - "zh-CN": "卢森堡" - }, - "LV": { - "de": "Lettland", - "en": "Latvia", - "es": "Letonia", - "fr": "Lettonie", - "ja": "ラトビア共和国", - "pt-BR": "Letônia", - "ru": "Латвия", - "zh-CN": "拉脱维亚" - }, - "LY": { - "de": "Libysch-Arabische Dschamahirija", - "en": "Libya", - "es": "Libia", - "fr": "Libye", - "ja": "社会主義人民リビア・アラブ国", - "pt-BR": "Líbia Árabe Jamahiriya", - "ru": "Ливия", - "zh-CN": "阿拉伯利比亚民众国" - }, - "MA": { - "de": "Marokko", - "en": "Morocco", - "es": "Marruecos", - "fr": "Maroc", - "ja": "モロッコ王国", - "pt-BR": "Marrocos", - "ru": "Марокко", - "zh-CN": "摩洛哥" - }, - "MC": { - "de": "Monaco", - "en": "Monaco", - "es": "Mónaco", - "fr": "Monaco", - "ja": "モナコ", - "pt-BR": "Mónaco", - "ru": "Монако", - "zh-CN": "摩纳哥" - }, - "MD": { - "de": "Moldau (Republik Moldau)", - "en": "Republic of Moldova", - "es": "Moldavia", - "fr": "Moldavie", - "ja": "モルドバ共和国", - "pt-BR": "Moldova, República de", - "ru": "Молдова", - "zh-CN": "摩尔多瓦共和国" - }, - "ME": { - "de": "Montenegro", - "en": "Montenegro", - "es": "Montenegro", - "fr": "Monténégro", - "ja": "モンテネグロ", - "pt-BR": "Montenegro", - "ru": "Черногория", - "zh-CN": "黑山共和国" - }, - "MF": { - "de": "St. Martin", - "en": "Saint Martin", - "es": "San Martín", - "fr": "Saint-Martin", - "ja": "仏領サン・マルタン", - "pt-BR": "São Martinho", - "ru": "Остров Святого Мартина", - "zh-CN": "圣马丁" - }, - "MG": { - "de": "Madagaskar", - "en": "Madagascar", - "es": "Madagascar", - "fr": "Madagascar", - "ja": "マダガスカル共和国", - "pt-BR": "Madagascar", - "ru": "Мадагаскар", - "zh-CN": "马达加斯加" - }, - "MH": { - "de": "Marshall-Inseln", - "en": "Marshall Islands", - "es": "Islas Marshall", - "fr": "Îles Marshall", - "ja": "マーシャル諸島共和国", - "pt-BR": "Ilhas Marshall", - "ru": "Маршалловы о-ва", - "zh-CN": "马绍尔群岛" - }, - "MK": { - "de": "Ehemalige jugoslawische Republik Mazedonien", - "en": "Macedonia", - "es": "Macedonia", - "fr": "Macédoine", - "ja": "マケドニア旧ユーゴスラビア共和国", - "pt-BR": "Macedônia", - "ru": "Македония", - "zh-CN": "前南斯拉夫马其顿共和国" - }, - "ML": { - "de": "Mali", - "en": "Mali", - "es": "Mali", - "fr": "Mali", - "ja": "マリ共和国", - "pt-BR": "Mali", - "ru": "Мали", - "zh-CN": "马里" - }, - "MM": { - "de": "Birma (Myanmar)", - "en": "Myanmar [Burma]", - "es": "Myanmar [Birmania]", - "fr": "Myanmar", - "ja": "ミャンマー連邦", - "pt-BR": "Mianmar [Birmânia]", - "ru": "Мьянма", - "zh-CN": "缅甸" - }, - "MN": { - "de": "Mongolei", - "en": "Mongolia", - "es": "Mongolia", - "fr": "Mongolie", - "ja": "モンゴル国", - "pt-BR": "Mongólia", - "ru": "Монголия", - "zh-CN": "蒙古" - }, - "MO": { - "de": "Macau", - "en": "Macao", - "es": "Macao", - "fr": "Macao", - "ja": "マカオ", - "pt-BR": "Região Administrativa Especial de Macau", - "ru": "Макао", - "zh-CN": "澳门" - }, - "MP": { - "de": "Nördliche Marianen", - "en": "Northern Mariana Islands", - "es": "Islas Marianas del Norte", - "fr": "Îles Mariannes du Nord", - "ja": "北マリアナ諸島", - "pt-BR": "Ilhas Marianas do Norte", - "ru": "Северные Марианские о-ва", - "zh-CN": "北马里亚纳群岛" - }, - "MQ": { - "de": "Martinique", - "en": "Martinique", - "es": "Martinica", - "fr": "Martinique", - "ja": "マルティニーク島", - "pt-BR": "Martinica", - "ru": "Мартиника", - "zh-CN": "马提尼克群岛" - }, - "MR": { - "de": "Mauretanien", - "en": "Mauritania", - "es": "Mauritania", - "fr": "Mauritanie", - "ja": "モーリタニア・イスラム共和国", - "pt-BR": "Mauritânia", - "ru": "Мавритания", - "zh-CN": "毛里塔尼亚" - }, - "MS": { - "de": "Montserrat", - "en": "Montserrat", - "es": "Montserrat", - "fr": "Montserrat", - "ja": "モントセラト島", - "pt-BR": "Montserrat", - "ru": "Монсеррат", - "zh-CN": "蒙塞拉特群岛" - }, - "MT": { - "de": "Malta", - "en": "Malta", - "es": "Malta", - "fr": "Malte", - "ja": "マルタ島", - "pt-BR": "Malta", - "ru": "Мальта", - "zh-CN": "马耳他" - }, - "MU": { - "de": "Mauritius", - "en": "Mauritius", - "es": "Mauricio", - "fr": "Maurice", - "ja": "モーリシャス", - "pt-BR": "Maurício", - "ru": "Маврикий", - "zh-CN": "毛里求斯" - }, - "MV": { - "de": "Malediven", - "en": "Maldives", - "es": "Maldivas", - "fr": "Maldives", - "ja": "モルジブ", - "pt-BR": "Maldivas", - "ru": "Мальдивские о-ва", - "zh-CN": "马尔代夫" - }, - "MW": { - "de": "Malawi", - "en": "Malawi", - "es": "Malaui", - "fr": "Malawi", - "ja": "マラウイ共和国", - "pt-BR": "Malauí", - "ru": "Малави", - "zh-CN": "马拉维" - }, - "MX": { - "de": "Mexiko", - "en": "Mexico", - "es": "México", - "fr": "Mexique", - "ja": "メキシコ合衆国", - "pt-BR": "México", - "ru": "Мексика", - "zh-CN": "墨西哥" - }, - "MY": { - "de": "Malaysia", - "en": "Malaysia", - "es": "Malasia", - "fr": "Malaisie", - "ja": "マレーシア", - "pt-BR": "Malásia", - "ru": "Малайзия", - "zh-CN": "马来西亚" - }, - "MZ": { - "de": "Mosambik", - "en": "Mozambique", - "es": "Mozambique", - "fr": "Mozambique", - "ja": "モザンビーク共和国", - "pt-BR": "República de Moçambique", - "ru": "Мозамбик", - "zh-CN": "莫桑比克" - }, - "NA": { - "de": "Namibia", - "en": "Namibia", - "es": "Namibia", - "fr": "Namibie", - "ja": "ナミビア共和国", - "pt-BR": "Namíbia", - "ru": "Намибия", - "zh-CN": "纳米比亚" - }, - "NC": { - "de": "Neukaledonien", - "en": "New Caledonia", - "es": "Nueva Caledonia", - "fr": "Nouvelle-Calédonie", - "ja": "ニューカレドニア", - "pt-BR": "Nova Caledônia", - "ru": "Новая Каледония", - "zh-CN": "新喀里多尼亚" - }, - "NE": { - "de": "Niger", - "en": "Niger", - "es": "Níger", - "fr": "Niger", - "ja": "ニジェール共和国", - "pt-BR": "Níger", - "ru": "Нигер", - "zh-CN": "尼日尔" - }, - "NF": { - "de": "Norfolkinsel", - "en": "Norfolk Island", - "es": "Isla Norfolk", - "fr": "Île Norfolk", - "ja": "ノーフォーク島", - "pt-BR": "Ilha Norfolk", - "ru": "Остров Норфолк", - "zh-CN": "诺福克岛" - }, - "NG": { - "de": "Nigeria", - "en": "Nigeria", - "es": "Nigeria", - "fr": "Nigeria", - "ja": "ナイジェリア連邦共和国", - "pt-BR": "Nigéria", - "ru": "Нигерия", - "zh-CN": "尼日利亚" - }, - "NI": { - "de": "Nikaragua", - "en": "Nicaragua", - "es": "Nicaragua", - "fr": "Nicaragua", - "ja": "ニカラグア共和国", - "pt-BR": "Nicarágua", - "ru": "Никарагуа", - "zh-CN": "尼加拉瓜" - }, - "NL": { - "de": "Niederlande", - "en": "Netherlands", - "es": "Holanda", - "fr": "Pays-Bas", - "ja": "オランダ王国", - "pt-BR": "Holanda", - "ru": "Нидерланды", - "zh-CN": "荷兰" - }, - "NO": { - "de": "Norwegen", - "en": "Norway", - "es": "Noruega", - "fr": "Norvège", - "ja": "ノルウェー王国", - "pt-BR": "Noruega", - "ru": "Норвегия", - "zh-CN": "挪威" - }, - "NP": { - "de": "Nepal", - "en": "Nepal", - "es": "Nepal", - "fr": "Népal", - "ja": "ネパール王国", - "pt-BR": "Nepal", - "ru": "Непал", - "zh-CN": "尼泊尔" - }, - "NR": { - "de": "Nauru", - "en": "Nauru", - "es": "Nauru", - "fr": "Nauru", - "ja": "ナウル", - "pt-BR": "Nauru", - "ru": "Науру", - "zh-CN": "瑙鲁" - }, - "NU": { - "de": "Niue", - "en": "Niue", - "es": "Isla Niue", - "fr": "Nioué", - "ja": "ニウエ島", - "pt-BR": "Niue", - "ru": "Ниуе", - "zh-CN": "纽埃" - }, - "NZ": { - "de": "Neuseeland", - "en": "New Zealand", - "es": "Nueva Zelanda", - "fr": "Nouvelle-Zélande", - "ja": "ニュージーランド", - "pt-BR": "Nova Zelândia", - "ru": "Новая Зеландия", - "zh-CN": "新西兰" - }, - "OM": { - "de": "Oman", - "en": "Oman", - "es": "Omán", - "fr": "Oman", - "ja": "オマーン国", - "pt-BR": "Omã", - "ru": "Оман", - "zh-CN": "阿曼" - }, - "PA": { - "de": "Panama", - "en": "Panama", - "es": "Panamá", - "fr": "Panama", - "ja": "パナマ", - "pt-BR": "Panamá", - "ru": "Панама", - "zh-CN": "巴拿马" - }, - "PE": { - "de": "Peru", - "en": "Peru", - "es": "Perú", - "fr": "Pérou", - "ja": "ペルー共和国", - "pt-BR": "Peru", - "ru": "Перу", - "zh-CN": "秘鲁" - }, - "PF": { - "de": "Französisch-Polynesien", - "en": "French Polynesia", - "es": "Polinesia Francesa", - "fr": "Polynésie Française", - "ja": "仏領ポリネシア", - "pt-BR": "Polinésia Francesa", - "ru": "Французская Полинезия", - "zh-CN": "法属波利尼西亚" - }, - "PG": { - "de": "Papua-Neuguinea", - "en": "Papua New Guinea", - "es": "Papúa-Nueva Guinea", - "fr": "Papouasie-Nouvelle Guinée", - "ja": "パプア・ニューギニア", - "pt-BR": "Papua-Nova Guiné", - "ru": "Папуа \u2013 Новая Гвинея", - "zh-CN": "巴布亚新几内亚" - }, - "PH": { - "de": "Philippinen", - "en": "Philippines", - "es": "Filipinas", - "fr": "Philippines", - "ja": "フィリピン共和国", - "pt-BR": "Filipinas", - "ru": "Филиппины", - "zh-CN": "菲律宾" - }, - "PK": { - "de": "Pakistan", - "en": "Pakistan", - "es": "Pakistán", - "fr": "Pakistan", - "ja": "パキスタン・イスラム共和国", - "pt-BR": "Paquistão", - "ru": "Пакистан", - "zh-CN": "巴基斯坦" - }, - "PL": { - "de": "Polen", - "en": "Poland", - "es": "Polonia", - "fr": "Pologne", - "ja": "ポーランド共和国", - "pt-BR": "Polônia", - "ru": "Польша", - "zh-CN": "波兰" - }, - "PM": { - "de": "St. Pierre und Miquelon", - "en": "Saint Pierre and Miquelon", - "es": "San Pedro y Miquelón", - "fr": "Saint-Pierre et Miquelon", - "ja": "サンピエール島・ミクロン島", - "pt-BR": "Saint Pierre e Miquelon", - "ru": "Сен-Пьер и Микелон", - "zh-CN": "圣皮埃尔和密克隆" - }, - "PN": { - "de": "Pitcairn", - "en": "Pitcairn Islands", - "es": "Islas Pitcairn", - "fr": "Pitcairn", - "ja": "ピトケアン島", - "pt-BR": "Pitcairn", - "ru": "Питкэрн", - "zh-CN": "皮特凯恩群岛" - }, - "PR": { - "de": "Puerto Rico", - "en": "Puerto Rico", - "es": "Puerto Rico", - "fr": "Porto Rico", - "ja": "プエルトリコ", - "pt-BR": "Porto Rico", - "ru": "Пуэрто-Рико", - "zh-CN": "波多黎各" - }, - "PS": { - "de": "Palästinensische Autonomiegebiete", - "en": "Palestine", - "es": "Territorios Palestinos", - "fr": "Territoire palestinien", - "ja": "パレスチナ", - "pt-BR": "Territórios palestinos", - "ru": "Палестинские территории", - "zh-CN": "巴勒斯坦领土" - }, - "PT": { - "de": "Portugal", - "en": "Portugal", - "es": "Portugal", - "fr": "Portugal", - "ja": "ポルトガル共和国", - "pt-BR": "Portugal", - "ru": "Португалия", - "zh-CN": "葡萄牙" - }, - "PW": { - "de": "Palau", - "en": "Palau", - "es": "Palaos", - "fr": "Palaos", - "ja": "パラオ", - "pt-BR": "Palau", - "ru": "Палау", - "zh-CN": "帕劳" - }, - "PY": { - "de": "Paraguay", - "en": "Paraguay", - "es": "Paraguay", - "fr": "Paraguay", - "ja": "パラグアイ共和国", - "pt-BR": "Paraguai", - "ru": "Парагвай", - "zh-CN": "巴拉圭" - }, - "QA": { - "de": "Katar", - "en": "Qatar", - "es": "Qatar", - "fr": "Qatar", - "ja": "カタール", - "pt-BR": "Catar", - "ru": "Катар", - "zh-CN": "卡塔尔" - }, - "RE": { - "de": "Réunion", - "en": "Réunion", - "es": "Reunión", - "fr": "Réunion", - "ja": "レユニオン島", - "pt-BR": "Reunião", - "ru": "Реюньон", - "zh-CN": "留尼汪" - }, - "RO": { - "de": "Rumänien", - "en": "Romania", - "es": "Rumanía", - "fr": "Roumanie", - "ja": "ルーマニア", - "pt-BR": "Romênia", - "ru": "Румыния", - "zh-CN": "罗马尼亚" - }, - "RS": { - "de": "Serbien", - "en": "Serbia", - "es": "Serbia", - "fr": "Serbie", - "ja": "セルビア", - "pt-BR": "Sérvia", - "ru": "Сербия", - "zh-CN": "塞尔维亚" - }, - "RU": { - "de": "Russland", - "en": "Russia", - "es": "Rusia", - "fr": "Russie", - "ja": "ロシア", - "pt-BR": "Rússia", - "ru": "Россия", - "zh-CN": "俄罗斯" - }, - "RW": { - "de": "Ruanda", - "en": "Rwanda", - "es": "Ruanda", - "fr": "Rwanda", - "ja": "ルワンダ共和国", - "pt-BR": "Ruanda", - "ru": "Руанда", - "zh-CN": "卢旺达" - }, - "SA": { - "de": "Saudi-Arabien", - "en": "Saudi Arabia", - "es": "Arabia Saudí", - "fr": "Arabie saoudite", - "ja": "サウジアラビア王国", - "pt-BR": "Arábia Saudita", - "ru": "Саудовская Аравия", - "zh-CN": "沙特阿拉伯" - }, - "SB": { - "de": "Solomon-Inseln", - "en": "Solomon Islands", - "es": "Islas Salomón", - "fr": "Îles Salomon", - "ja": "ソロモン諸島", - "pt-BR": "Ilhas Salomão", - "ru": "Соломонские острова", - "zh-CN": "所罗门群岛" - }, - "SC": { - "de": "Seychellen", - "en": "Seychelles", - "es": "Seychelles", - "fr": "Seychelles", - "ja": "セイシェル", - "pt-BR": "Ilhas Seychelles", - "ru": "Сейшельские о-ва", - "zh-CN": "塞舌尔群岛" - }, - "SD": { - "de": "Sudan", - "en": "Sudan", - "es": "Sudán", - "fr": "Soudan", - "ja": "スーダン共和国", - "pt-BR": "Sudão", - "ru": "Судан", - "zh-CN": "苏丹" - }, - "SE": { - "de": "Schweden", - "en": "Sweden", - "es": "Suecia", - "fr": "Suède", - "ja": "スウェーデン王国", - "pt-BR": "Suécia", - "ru": "Швеция", - "zh-CN": "瑞典" - }, - "SG": { - "de": "Singapur", - "en": "Singapore", - "es": "Singapur", - "fr": "Singapour", - "ja": "シンガポール", - "pt-BR": "Cingapura", - "ru": "Сингапур", - "zh-CN": "新加坡" - }, - "SH": { - "de": "St. Helena", - "en": "Saint Helena", - "es": "Santa Elena", - "fr": "Sainte-Hélène", - "ja": "セントヘレナ", - "pt-BR": "Santa Helena", - "ru": "Остров Святой Елены", - "zh-CN": "圣赫勒拿" - }, - "SI": { - "de": "Slowenien", - "en": "Slovenia", - "es": "Eslovenia", - "fr": "Slovénie", - "ja": "スロベニア", - "pt-BR": "Eslovênia", - "ru": "Словения", - "zh-CN": "斯洛文尼亚" - }, - "SJ": { - "de": "Svalbard und Jan Mayen", - "en": "Svalbard and Jan Mayen", - "es": "Svalbard y Jan Mayen", - "fr": "Svalbard et Jan Mayen", - "ja": "スバールバル諸島・ヤンマイエン島", - "pt-BR": "Svalbard e Jan Mayen", - "ru": "Свальбард и Ян-Майен", - "zh-CN": "斯瓦尔巴特和扬马延" - }, - "SK": { - "de": "Slowakei (Slowakische Republik)", - "en": "Slovakia", - "es": "Eslovaquia", - "fr": "Slovaquie", - "ja": "スロバキア (スロバキア共和国)", - "pt-BR": "Eslováquia", - "ru": "Словакия", - "zh-CN": "斯洛伐克共和国" - }, - "SL": { - "de": "Sierra Leone", - "en": "Sierra Leone", - "es": "Sierra Leona", - "fr": "Sierra Leone", - "ja": "シエラレオネ", - "pt-BR": "Serra Leoa", - "ru": "Сьерра-Леоне", - "zh-CN": "塞拉利昂" - }, - "SM": { - "de": "San Marino", - "en": "San Marino", - "es": "San Marino", - "fr": "Saint-Marin", - "ja": "サンマリノ共和国", - "pt-BR": "San Marino", - "ru": "Сан-Марино", - "zh-CN": "圣马力诺" - }, - "SN": { - "de": "Senegal", - "en": "Senegal", - "es": "Senegal", - "fr": "Sénégal", - "ja": "セネガル共和国", - "pt-BR": "Senegal", - "ru": "Сенегал", - "zh-CN": "塞内加尔" - }, - "SO": { - "de": "Somalia", - "en": "Somalia", - "es": "Somalia", - "fr": "Somalie", - "ja": "ソマリア", - "pt-BR": "Somália", - "ru": "Сомали", - "zh-CN": "索马里" - }, - "SR": { - "de": "Suriname", - "en": "Suriname", - "es": "Surinam", - "fr": "Surinam", - "ja": "スリナム共和国", - "pt-BR": "Suriname", - "ru": "Суринам", - "zh-CN": "苏里南" - }, - "SS": { - "de": "Südsudan", - "en": "South Sudan", - "es": "Sudán del Sur", - "fr": "Sud-Soudan", - "ja": "南スーダン", - "pt-BR": "Sudão do Sul", - "ru": "Южный Судан", - "zh-CN": "南苏丹" - }, - "ST": { - "de": "Sao Tomé und Principe", - "en": "São Tomé and Príncipe", - "es": "Santo Tomé y Príncipe", - "fr": "São Tomé-et-Príncipe", - "ja": "サントメ・プリンシペ", - "pt-BR": "República Democrática de São Tomé e Príncipe", - "ru": "Сан-Томе и Принсипе", - "zh-CN": "圣多美和普林西比" - }, - "SV": { - "de": "El Salvador", - "en": "El Salvador", - "es": "El Salvador", - "fr": "Salvador", - "ja": "エルサルバドル", - "pt-BR": "El Salvador", - "ru": "Сальвадор", - "zh-CN": "萨尔瓦多" - }, - "SX": { - "de": "Sint Maarten", - "en": "Sint Maarten", - "es": "San Martín", - "fr": "Saint-Martin", - "ja": "シント・マールテン", - "pt-BR": "São Martinho", - "ru": "Синт-Мартен", - "zh-CN": "圣马丁岛" - }, - "SY": { - "de": "Syrien", - "en": "Syria", - "es": "Siria", - "fr": "Syrie", - "ja": "シリア・アラブ共和国", - "pt-BR": "Síria", - "ru": "Сирийская Арабская Республика", - "zh-CN": "叙利亚" - }, - "SZ": { - "de": "Swasiland", - "en": "Swaziland", - "es": "Suazilandia", - "fr": "Swaziland", - "ja": "スワジランド王国", - "pt-BR": "Suazilândia", - "ru": "Свазиленд", - "zh-CN": "斯威士兰" - }, - "TC": { - "de": "Turks- und Caicosinseln", - "en": "Turks and Caicos Islands", - "es": "Islas Turcas y Caicos", - "fr": "Îles Turques-et-Caïques", - "ja": "タークス諸島・カイコス諸島", - "pt-BR": "Ilhas Turks e Caicos", - "ru": "Острова Тёркс и Кайкос", - "zh-CN": "特克斯和凯科斯群岛" - }, - "TD": { - "de": "Tschad", - "en": "Chad", - "es": "Chad", - "fr": "Tchad", - "ja": "チャド共和国", - "pt-BR": "Chade", - "ru": "Чад", - "zh-CN": "乍得" - }, - "TF": { - "de": "Französische Süd- und Antarktisgebiete", - "en": "French Southern Territories", - "es": "Territorios Australes Franceses", - "fr": "Terres australes françaises", - "ja": "仏領極南諸島", - "pt-BR": "Territórios Franceses do Sul", - "ru": "Французские Южные Территории", - "zh-CN": "法属南部领土" - }, - "TG": { - "de": "Togo", - "en": "Togo", - "es": "Togo", - "fr": "Togo", - "ja": "トーゴ共和国", - "pt-BR": "Togo", - "ru": "Того", - "zh-CN": "多哥" - }, - "TH": { - "de": "Thailand", - "en": "Thailand", - "es": "Tailandia", - "fr": "Thaïlande", - "ja": "タイ王国", - "pt-BR": "Tailândia", - "ru": "Тайланд", - "zh-CN": "泰国" - }, - "TJ": { - "de": "Tadschikistan", - "en": "Tajikistan", - "es": "Tayikistán", - "fr": "Tadjikistan", - "ja": "タジキスタン共和国", - "pt-BR": "Tajiquistão", - "ru": "Таджикистан", - "zh-CN": "塔吉克斯坦" - }, - "TK": { - "de": "Tokelau", - "en": "Tokelau", - "es": "Tokelau", - "fr": "Tokelau", - "ja": "トケラウ諸島", - "pt-BR": "Tokelau", - "ru": "Токелау", - "zh-CN": "托克劳" - }, - "TL": { - "de": "Timor-Leste", - "en": "East Timor", - "es": "Timor Oriental", - "fr": "Timor Oriental", - "ja": "東ティモール共和国", - "pt-BR": "República Democrática de Timor-Leste", - "ru": "Восточный Тимор", - "zh-CN": "东帝汶" - }, - "TM": { - "de": "Turkmenistan", - "en": "Turkmenistan", - "es": "Turkmenistán", - "fr": "Turkménistan", - "ja": "トルクメニスタン", - "pt-BR": "Turcomenistão", - "ru": "Туркменистан", - "zh-CN": "土库曼斯坦" - }, - "TN": { - "de": "Tunesien", - "en": "Tunisia", - "es": "Túnez", - "fr": "Tunisie", - "ja": "チュニジア共和国", - "pt-BR": "Tunísia", - "ru": "Тунис", - "zh-CN": "突尼斯" - }, - "TO": { - "de": "Tonga", - "en": "Tonga", - "es": "Tonga", - "fr": "Tonga", - "ja": "トンガ王国", - "pt-BR": "Tonga", - "ru": "Тонга", - "zh-CN": "汤加" - }, - "TR": { - "de": "Türkei", - "en": "Turkey", - "es": "Turquía", - "fr": "Turquie", - "ja": "トルコ共和国", - "pt-BR": "Turquia", - "ru": "Турция", - "zh-CN": "土耳其" - }, - "TT": { - "de": "Trinidad und Tobago", - "en": "Trinidad and Tobago", - "es": "Trinidad y Tobago", - "fr": "Trinidad et Tobago", - "ja": "トリニダード・トバゴ共和国", - "pt-BR": "Trindade e Tobago", - "ru": "Тринидад и Тобаго", - "zh-CN": "特立尼达和多巴哥" - }, - "TV": { - "de": "Tuwalu", - "en": "Tuvalu", - "es": "Tuvalu", - "fr": "Tuvalu", - "ja": "ツバル", - "pt-BR": "Tuvalu", - "ru": "Тувалу", - "zh-CN": "图瓦卢" - }, - "TW": { - "de": "Taiwan", - "en": "Taiwan", - "es": "Taiwán", - "fr": "Taïwan", - "ja": "中華民国", - "pt-BR": "Taiwan", - "ru": "Тайвань", - "zh-CN": "台湾" - }, - "TZ": { - "de": "Tansania", - "en": "Tanzania", - "es": "Tanzania", - "fr": "Tanzanie", - "ja": "タンザニア連合共和国", - "pt-BR": "Tanzânia", - "ru": "Танзания", - "zh-CN": "坦桑尼亚" - }, - "UA": { - "de": "Ukraine", - "en": "Ukraine", - "es": "Ucrania", - "fr": "Ukraine", - "ja": "ウクライナ共和国", - "pt-BR": "Ucrânia", - "ru": "Украина", - "zh-CN": "乌克兰" - }, - "UG": { - "de": "Uganda", - "en": "Uganda", - "es": "Uganda", - "fr": "Ouganda", - "ja": "ウガンダ共和国", - "pt-BR": "Uganda", - "ru": "Уганда", - "zh-CN": "乌干达" - }, - "UM": { - "de": "Amerikanisch-Ozeanien", - "en": "U.S. Minor Outlying Islands", - "es": "Islas menores alejadas de los Estados Unidos", - "fr": "Îles mineures éloignées des États-Unis", - "ja": "米領太平洋諸島", - "pt-BR": "Ilhas Menores Distantes dos Estados Unidos", - "ru": "Внешние малые острова (США)", - "zh-CN": "美国边远小岛" - }, - "US": { - "de": "USA", - "en": "United States", - "es": "Estados Unidos", - "fr": "États-Unis", - "ja": "アメリカ合衆国", - "pt-BR": "Estados Unidos", - "ru": "США", - "zh-CN": "美国" - }, - "UY": { - "de": "Uruguay", - "en": "Uruguay", - "es": "Uruguay", - "fr": "Uruguay", - "ja": "ウルグアイ共和国", - "pt-BR": "Uruguai", - "ru": "Уругвай", - "zh-CN": "乌拉圭" - }, - "UZ": { - "de": "Usbekistan", - "en": "Uzbekistan", - "es": "Uzbekistán", - "fr": "Ouzbékistan", - "ja": "ウズベキスタン共和国", - "pt-BR": "Uzbequistão", - "ru": "Узбекистан", - "zh-CN": "乌兹别克斯坦" - }, - "VA": { - "de": "Staat der Vatikanstadt", - "en": "Vatican City", - "es": "Ciudad del Vaticano", - "fr": "Vatican", - "ja": "ローマ法王庁 (バチカン市国)", - "pt-BR": "Vaticano", - "ru": "Ватикан", - "zh-CN": "圣座（梵蒂冈）" - }, - "VC": { - "de": "St. Vincent und die Grenadinen", - "en": "Saint Vincent and the Grenadines", - "es": "San Vicente y las Granadinas", - "fr": "Saint-Vincent-et-les Grenadines", - "ja": "セントビンセント・グレナディーン諸島", - "pt-BR": "São Vincente e Granadinas", - "ru": "Сент-Винсент и Гренадины", - "zh-CN": "圣文森特和格林纳丁斯" - }, - "VE": { - "de": "Venezuela", - "en": "Venezuela", - "es": "Venezuela", - "fr": "Vénézuéla", - "ja": "ベネズエラ共和国", - "pt-BR": "Venezuela", - "ru": "Венесуэла", - "zh-CN": "委内瑞拉" - }, - "VG": { - "de": "Britische Jungferninseln", - "en": "British Virgin Islands", - "es": "Islas Vírgenes", - "fr": "Îles Vierges", - "ja": "英領ヴァージン諸島", - "pt-BR": "Ilhas Virgens Britânicas", - "ru": "Британские Виргинские о-ва", - "zh-CN": "英属维京群岛" - }, - "VI": { - "de": "Amerikanische Jungferninseln", - "en": "U.S. Virgin Islands", - "es": "Islas Vírgenes de los Estados Unidos", - "fr": "Îles Vierges des États-Unis", - "ja": "米領ヴァージン諸島", - "pt-BR": "Ilhas Virgens dos EUA", - "ru": "Виргинские о-ва (США)", - "zh-CN": "美属维京群岛" - }, - "VN": { - "de": "Vietnam", - "en": "Vietnam", - "es": "Vietnam", - "fr": "Vietnam", - "ja": "ベトナム", - "pt-BR": "Vietnã", - "ru": "Вьетнам", - "zh-CN": "越南" - }, - "VU": { - "de": "Vanuatu", - "en": "Vanuatu", - "es": "Vanuatu", - "fr": "Vanuatu", - "ja": "バヌアツ共和国", - "pt-BR": "Vanuatu", - "ru": "Вануату", - "zh-CN": "瓦努阿图" - }, - "WF": { - "de": "Wallis und Futuna", - "en": "Wallis and Futuna", - "es": "Wallis y Futuna", - "fr": "Wallis-et-Futuna", - "ja": "ワリー エ フトゥーナ諸島", - "pt-BR": "Ilhas Wallis e Futuna", - "ru": "Уоллис и Футуна", - "zh-CN": "瓦利斯和富图纳" - }, - "WS": { - "de": "Samoa", - "en": "Samoa", - "es": "Samoa", - "fr": "Samoa", - "ja": "西サモア", - "pt-BR": "Samoa", - "ru": "Самоа", - "zh-CN": "萨摩亚" - }, - "XK": { - "de": "Kosovo", - "en": "Kosovo", - "es": "Kosovo", - "fr": "Kosovo", - "ja": "コソボ", - "pt-BR": "Kosovo", - "ru": "Косово", - "zh-CN": "科索沃" - }, - "YE": { - "de": "Jemen", - "en": "Yemen", - "es": "Yemen", - "fr": "Yémen", - "ja": "イエメン共和国", - "pt-BR": "Iêmen", - "ru": "Йемен", - "zh-CN": "也门" - }, - "YT": { - "de": "Mayotte", - "en": "Mayotte", - "es": "Mayotte", - "fr": "Mayotte", - "ja": "マヨット島", - "pt-BR": "Mayotte", - "ru": "Майотта", - "zh-CN": "马约特" - }, - "ZA": { - "de": "Südafrika", - "en": "South Africa", - "es": "Sudáfrica", - "fr": "Afrique du Sud", - "ja": "南アフリカ", - "pt-BR": "África do Sul", - "ru": "ЮАР", - "zh-CN": "南非" - }, - "ZM": { - "de": "Sambia", - "en": "Zambia", - "es": "Zambia", - "fr": "Zambie", - "ja": "ザンビア共和国", - "pt-BR": "Zâmbia", - "ru": "Замбия", - "zh-CN": "赞比亚" - }, - "ZW": { - "de": "Simbabwe", - "en": "Zimbabwe", - "es": "Zimbawe", - "fr": "Zimbabwe", - "ja": "ジンバブエ共和国", - "pt-BR": "Zimbábue", - "ru": "Зимбабве", - "zh-CN": "津巴布韦" - } -} \ No newline at end of file diff --git a/uml2es/examples/declarativeCity/data/source/dmdemo/population.json b/uml2es/examples/declarativeCity/data/source/dmdemo/population.json deleted file mode 100644 index 5076b9a..0000000 --- a/uml2es/examples/declarativeCity/data/source/dmdemo/population.json +++ /dev/null @@ -1,897 +0,0 @@ -[ - { - "name": "Shanghai", - "country": "CN", - "population": "24153", - "metro-population": "34000", - "language": "zh-CN" - }, - { - "name": "BEIJING", - "country": "CN", - "population": "18590", - "metro-population": "24900", - "language": "zh-CN" - }, - { - "name": "Karachi", - "country": "PK", - "population": "18000", - "metro-population": "27506", - "language": "es" - }, - { - "name": "Istanbul", - "country": "TR", - "population": "14657", - "metro-population": "14804", - "language": "de" - }, - { - "name": "DHAKA", - "country": "BD", - "population": "14543", - "metro-population": "18898" - }, - { - "name": "TOKYO", - "country": "JP", - "population": "13617", - "metro-population": "37800", - "language": "ja" - }, - { - "name": "MOSCOW", - "country": "RU", - "population": "13197.596", - "metro-population": "17900", - "language": "ru" - }, - { - "name": "MANILA", - "country": "PH", - "population": "12877", - "metro-population": "22710" - }, - { - "name": "Tianjin", - "country": "CN", - "population": "12784", - "metro-population": "15469" - }, - { - "name": "Mumbai (Bombay)", - "country": "IN", - "population": "12400", - "metro-population": "27750" - }, - { - "name": "Sao Paulo", - "country": "BR", - "population": "12038", - "metro-population": "21243", - "language": "pt-BR" - }, - { - "name": "Shenzhen", - "country": "CN", - "population": "11908", - "metro-population": "11980" - }, - { - "name": "Guangzhou", - "country": "CN", - "population": "11548", - "metro-population": "14044" - }, - { - "name": "DELHI", - "country": "IN", - "population": "11035", - "metro-population": "26454" - }, - { - "name": "Wuhan", - "country": "CN", - "population": "10608", - "metro-population": "10608" - }, - { - "name": "Seoul", - "country": "KR", - "population": "10290", - "metro-population": "25600" - }, - { - "name": "Chengdu", - "country": "CN", - "population": "10152", - "metro-population": "14427" - }, - { - "name": "KINSHASA", - "country": "CD", - "population": "10125", - "metro-population": "21265", - "language": "zh-CN" - }, - { - "name": "LIMA", - "country": "PE", - "population": "9752", - "metro-population": "10852" - }, - { - "name": "JAKARTA", - "country": "ID", - "population": "9608", - "metro-population": "30214" - }, - { - "name": "CAIRO", - "country": "EG", - "population": "9500", - "metro-population": "20440" - }, - { - "name": "MEXICO CITY", - "country": "MX", - "population": "8919", - "metro-population": "20400" - }, - { - "name": "TEHRAN", - "country": "IR", - "population": "8847", - "metro-population": "15233" - }, - { - "name": "Xian", - "country": "CN", - "population": "8705", - "metro-population": "13560" - }, - { - "name": "LONDON", - "country": "UK", - "population": "8674", - "metro-population": "13880" - }, - { - "name": "New York City", - "country": "US", - "population": "8550", - "metro-population": "23724" - }, - { - "name": "Nanjing", - "country": "CN", - "population": "8460", - "metro-population": "8460" - }, - { - "name": "Bangalore", - "country": "IN", - "population": "8444", - "metro-population": "8729" - }, - { - "name": "Ho Chi Minh City", - "country": "VN", - "population": "8426", - "metro-population": "10050" - }, - { - "name": "BANGKOK", - "country": "TH", - "population": "8281", - "metro-population": "14566" - }, - { - "name": "Chongquin", - "country": "CN", - "population": "8165.5", - "metro-population": "18380" - }, - { - "name": "BOGOTA", - "country": "CO", - "population": "8081", - "metro-population": "9800" - }, - { - "name": "Lagos", - "country": "NG", - "population": "8048", - "metro-population": "16060" - }, - { - "name": "RIYADH", - "country": "SA", - "population": "7506", - "metro-population": "7506" - }, - { - "name": "Chennai", - "country": "IN", - "population": "7088", - "metro-population": "8653" - }, - { - "name": "Hangzhou", - "country": "CN", - "population": "7082", - "metro-population": "9188" - }, - { - "name": "Hyderabad", - "country": "IN", - "population": "6809", - "metro-population": "7749" - }, - { - "name": "Rio de Janeiro", - "country": "BR", - "population": "6454", - "metro-population": "12281" - }, - { - "name": "Zhengzhou", - "country": "CN", - "population": "6406", - "metro-population": "9468" - }, - { - "name": "Shenyang", - "country": "CN", - "population": "6255", - "metro-population": "8106" - }, - { - "name": "Qingdao", - "country": "CN", - "population": "6188", - "metro-population": "9046" - }, - { - "name": "SANTIAGO", - "country": "CL", - "population": "6158", - "metro-population": "6582", - "language": "zh-CN" - }, - { - "name": "Dalian", - "country": "CN", - "population": "5900", - "metro-population": "6700" - }, - { - "name": "SINGAPORE", - "country": "SG", - "population": "5607", - "metro-population": "5607" - }, - { - "name": "Ahmadabad", - "country": "IN", - "population": "5577", - "metro-population": "6357" - }, - { - "name": "Suzhou", - "country": "CN", - "population": "5468", - "metro-population": "10578" - }, - { - "name": "St Petersburg", - "country": "RU", - "population": "5323", - "metro-population": "7500" - }, - { - "name": "Harbin", - "country": "CN", - "population": "5282", - "metro-population": "6704" - }, - { - "name": "ANKARA", - "country": "TR", - "population": "5271", - "metro-population": "6280" - }, - { - "name": "KHARTOUM", - "country": "SD", - "population": "5185", - "metro-population": "5185" - }, - { - "name": "Yangon", - "country": "MM", - "population": "5160", - "metro-population": "7360" - }, - { - "name": "Casablanca", - "country": "MA", - "population": "5118", - "metro-population": "6861" - }, - { - "name": "Sydney", - "country": "AU", - "population": "5005", - "metro-population": "5005" - }, - { - "name": "Jinan", - "country": "CN", - "population": "4694", - "metro-population": "7068" - }, - { - "name": "Melbourne", - "country": "AU", - "population": "4641", - "metro-population": "4641" - }, - { - "name": "Changsha", - "country": "CN", - "population": "4597", - "metro-population": "7432" - }, - { - "name": "Kolkata", - "country": "IN", - "population": "4497", - "metro-population": "14618" - }, - { - "name": "Fuzhou", - "country": "CN", - "population": "4468", - "metro-population": "7200" - }, - { - "name": "Surat", - "country": "IN", - "population": "4467", - "metro-population": "4591" - }, - { - "name": "Abidjan", - "country": "CI", - "population": "4396", - "metro-population": "4707" - }, - { - "name": "DAR ES SALAAM", - "country": "TZ", - "population": "4364", - "metro-population": "4364" - }, - { - "name": "Shiziahuang", - "country": "CN", - "population": "4303", - "metro-population": "10701" - }, - { - "name": "Jeddah", - "country": "SA", - "population": "4276", - "metro-population": "4276" - }, - { - "name": "Faisalabad", - "country": "PK", - "population": "4075", - "metro-population": "4075" - }, - { - "name": "Nanning", - "country": "CN", - "population": "4037", - "metro-population": "6914", - "language": "zh-CN" - }, - { - "name": "Alexandria", - "country": "EG", - "population": "4028", - "metro-population": "4984" - }, - { - "name": "AMMAN", - "country": "JO", - "population": "4008", - "metro-population": "4008" - }, - { - "name": "Los Angeles", - "country": "US", - "population": "3976", - "metro-population": "13131" - }, - { - "name": "Kunming", - "country": "CN", - "population": "3891", - "metro-population": "6626" - }, - { - "name": "Changchun", - "country": "CN", - "population": "3815", - "metro-population": "7674" - }, - { - "name": "Yokohama", - "country": "JP", - "population": "3733", - "metro-population": "3733" - }, - { - "name": "KABUL", - "country": "AF", - "population": "3678", - "metro-population": "3678" - }, - { - "name": "BERLIN", - "country": "DE", - "population": "3671", - "metro-population": "6004" - }, - { - "name": "Giza", - "country": "EG", - "population": "3628", - "metro-population": "3628" - }, - { - "name": "Urumqi", - "country": "CN", - "population": "3550", - "metro-population": "3550" - }, - { - "name": "Wuxi", - "country": "CN", - "population": "3542", - "metro-population": "6372" - }, - { - "name": "Busan", - "country": "KR", - "population": "3526", - "metro-population": "8202" - }, - { - "name": "Guayaquil", - "country": "EC", - "population": "3500", - "metro-population": "5000" - }, - { - "name": "HANOI", - "country": "VN", - "population": "3435", - "metro-population": "7588" - }, - { - "name": "Hyderabad", - "country": "PK", - "population": "3429", - "metro-population": "3429" - }, - { - "name": "ADDIS ABABA", - "country": "ET", - "population": "3385", - "metro-population": "4567" - }, - { - "name": "ALGIERS", - "country": "DZ", - "population": "3336", - "metro-population": "5000" - }, - { - "name": "Kano", - "country": "NG", - "population": "3333", - "metro-population": "3333" - }, - { - "name": "Mashhad", - "country": "IR", - "population": "3312", - "metro-population": "3372" - }, - { - "name": "Hefei", - "country": "CN", - "population": "3310", - "metro-population": "5484" - }, - { - "name": "Changzhou", - "country": "CN", - "population": "3290", - "metro-population": "4592" - }, - { - "name": "Taiyuan", - "country": "CN", - "population": "3212", - "metro-population": "4202" - }, - { - "name": "Rawalpindi", - "country": "PK", - "population": "3189", - "metro-population": "3189" - }, - { - "name": "Tangshan", - "country": "CN", - "population": "3187", - "metro-population": "7577" - }, - { - "name": "MADRID", - "country": "ES", - "population": "3141", - "metro-population": "6240" - }, - { - "name": "NAIROBI", - "country": "KE", - "population": "3138", - "metro-population": "6547" - }, - { - "name": "Zibo", - "country": "CN", - "population": "3129", - "metro-population": "4131" - }, - { - "name": "Pune", - "country": "IN", - "population": "3124", - "metro-population": "5057" - }, - { - "name": "Ibadan", - "country": "NG", - "population": "3050", - "metro-population": "3520" - }, - { - "name": "Jaipur", - "country": "IN", - "population": "3046", - "metro-population": "3046" - }, - { - "name": "Guiyang", - "country": "CN", - "population": "3037", - "metro-population": "4024" - }, - { - "name": "Incheon", - "country": "KR", - "population": "3002", - "metro-population": "3002" - }, - { - "name": "BRASILIA", - "country": "BR", - "population": "2978", - "metro-population": "2978", - "language": "pt-BR" - }, - { - "name": "TSHWANE (PRETORIA)", - "country": "ZA", - "population": "2922", - "metro-population": "2922" - }, - { - "name": "Kanpur", - "country": "IN", - "population": "2920", - "metro-population": "4152" - }, - { - "name": "Salvador", - "country": "BR", - "population": "2913", - "metro-population": "3920" - }, - { - "name": "BUENOS AIRES", - "country": "AR", - "population": "2900", - "metro-population": "12740" - }, - { - "name": "KIEV", - "country": "UA", - "population": "2900", - "metro-population": "3375" - }, - { - "name": "ROME", - "country": "IT", - "population": "2877", - "metro-population": "4353" - }, - { - "name": "Surabaya", - "country": "ID", - "population": "2865", - "metro-population": "6485" - }, - { - "name": "Izmir", - "country": "TR", - "population": "2848", - "metro-population": "4113" - }, - { - "name": "Lucknow", - "country": "IN", - "population": "2817", - "metro-population": "2902" - }, - { - "name": "Basrah", - "country": "IQ", - "population": "2750", - "metro-population": "2750" - }, - { - "name": "Toronto", - "country": "CA", - "population": "2731", - "metro-population": "5928" - }, - { - "name": "Gujranwala", - "country": "PK", - "population": "2723", - "metro-population": "2723" - }, - { - "name": "Chicago", - "country": "US", - "population": "2720", - "metro-population": "9513" - }, - { - "name": "TAIPEI", - "country": "TW", - "population": "2705", - "metro-population": "8500" - }, - { - "name": "QUITO", - "country": "EC", - "population": "2671", - "metro-population": "4700", - "language": "es" - }, - { - "name": "Osaka", - "country": "JP", - "population": "2668", - "metro-population": "19342" - }, - { - "name": "Xuzhou", - "country": "CN", - "population": "2623", - "metro-population": "3054" - }, - { - "name": "Fortaleza", - "country": "BR", - "population": "2610", - "metro-population": "4019" - }, - { - "name": "Chittagong", - "country": "BD", - "population": "2581", - "metro-population": "4009" - }, - { - "name": "PYONGYANG", - "country": "KP", - "population": "2581", - "metro-population": "2581" - }, - { - "name": "Bandung", - "country": "ID", - "population": "2575", - "metro-population": "8465" - }, - { - "name": "Kaohsiung", - "country": "TW", - "population": "2540", - "metro-population": "2779" - }, - { - "name": "YAOUNDE", - "country": "CM", - "population": "2535", - "metro-population": "2765" - }, - { - "name": "Daegu", - "country": "KR", - "population": "2522", - "metro-population": "5020" - }, - { - "name": "Taichung", - "country": "TW", - "population": "2520", - "metro-population": "2752" - }, - { - "name": "Belo Horizonte", - "country": "BR", - "population": "2502", - "metro-population": "5156" - }, - { - "name": "Puebla", - "country": "MX", - "population": "2500", - "metro-population": "2929" - }, - { - "name": "Douala", - "country": "CM", - "population": "2447", - "metro-population": "3000" - }, - { - "name": "Medellin", - "country": "CO", - "population": "2441", - "metro-population": "3731" - }, - { - "name": "Nagpur", - "country": "IN", - "population": "2405", - "metro-population": "2498" - }, - { - "name": "Cali", - "country": "CO", - "population": "2401", - "metro-population": "3400" - }, - { - "name": "Omdurman", - "country": "SD", - "population": "2396", - "metro-population": "2396" - }, - { - "name": "Nanchang", - "country": "CN", - "population": "2357", - "metro-population": "5043" - }, - { - "name": "Brisbane", - "country": "AU", - "population": "2350", - "metro-population": "3500" - }, - { - "name": "Bursa", - "country": "TR", - "population": "2340", - "metro-population": "2842" - }, - { - "name": "TASHKENT", - "country": "UZ", - "population": "2310", - "metro-population": "2310" - }, - { - "name": "Houston", - "country": "US", - "population": "2296", - "metro-population": "6313" - }, - { - "name": "Nagoya", - "country": "JP", - "population": "2283", - "metro-population": "9107" - }, - { - "name": "MOGADISHU", - "country": "SO", - "population": "2265", - "metro-population": "2265" - }, - { - "name": "Isfahen", - "country": "IR", - "population": "2243", - "metro-population": "3793" - }, - { - "name": "PARIS", - "country": "FR", - "population": "2230", - "metro-population": "12405", - "language": "fr" - }, - { - "name": "ACCRA", - "country": "GH", - "population": "2227", - "metro-population": "4000" - }, - { - "name": "MANAGUA", - "country": "NI", - "population": "2206", - "metro-population": "2561" - }, - { - "name": "Kowloon", - "country": "CN", - "population": "2204", - "metro-population": "2204" - }, - { - "name": "Lanzhou", - "country": "CN", - "population": "2177", - "metro-population": "3616" - }, - { - "name": "Baku", - "country": "AZ", - "population": "2122", - "metro-population": "2724" - }, - { - "name": "GUATAMALA CITY", - "country": "GT", - "population": "2110", - "metro-population": "4500" - }, - { - "name": "LUANDA", - "country": "AO", - "population": "2108", - "metro-population": "2825" - }, - { - "name": "BUCHAREST", - "country": "RO", - "population": "2106", - "metro-population": "2281" - } -] \ No newline at end of file diff --git a/uml2es/examples/declarativeCity/data/source/funbase/funbase_cities.csv b/uml2es/examples/declarativeCity/data/source/funbase/funbase_cities.csv deleted file mode 100644 index afc7c47..0000000 --- a/uml2es/examples/declarativeCity/data/source/funbase/funbase_cities.csv +++ /dev/null @@ -1,4 +0,0 @@ -city_name,country -Otter Lake,USA -US Flag,Moon -Venustown,Mars diff --git a/uml2es/examples/declarativeCity/end2end.png b/uml2es/examples/declarativeCity/end2end.png deleted file mode 100644 index 6a8cfa6..0000000 Binary files a/uml2es/examples/declarativeCity/end2end.png and /dev/null differ diff --git a/uml2es/examples/declarativeCity/gradle.properties b/uml2es/examples/declarativeCity/gradle.properties deleted file mode 100644 index fc6dd2e..0000000 --- a/uml2es/examples/declarativeCity/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -mlAppName=xmi2es-examples-dmcity -mlHost=localhost -mlUsername=admin -mlPassword=admin -mlRestPort=21042 -mlAppServicesPort=21042 -mlAppServicesHost=localhost -mlTestRestPort=21043 diff --git a/uml2es/examples/declarativeCity/lib/log4j.properties b/uml2es/examples/declarativeCity/lib/log4j.properties deleted file mode 100644 index e7e9930..0000000 --- a/uml2es/examples/declarativeCity/lib/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -#root logger option -log4j.rootLogger=INFO, stdout - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - diff --git a/uml2es/examples/declarativeCity/src/main/ml-config/databases/content-database.json b/uml2es/examples/declarativeCity/src/main/ml-config/databases/content-database.json deleted file mode 100644 index ad9bfd1..0000000 --- a/uml2es/examples/declarativeCity/src/main/ml-config/databases/content-database.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "database-name":"%%DATABASE%%", - "schema-database":"%%SCHEMAS_DATABASE%%", - "path-namespace":[{"prefix":"es", "namespace-uri":"http://marklogic.com/entity-services"}], - "range-element-index":[], - "triple-index":true, - "collection-lexicon":true -} diff --git a/uml2es/examples/declarativeCity/src/main/ml-config/databases/schemas-database.json b/uml2es/examples/declarativeCity/src/main/ml-config/databases/schemas-database.json deleted file mode 100644 index 1361cb5..0000000 --- a/uml2es/examples/declarativeCity/src/main/ml-config/databases/schemas-database.json +++ /dev/null @@ -1 +0,0 @@ -{"database-name": "%%SCHEMAS_DATABASE%%"} \ No newline at end of file diff --git a/uml2es/examples/declarativeCity/src/main/ml-config/rest-api.json b/uml2es/examples/declarativeCity/src/main/ml-config/rest-api.json deleted file mode 100755 index d671a93..0000000 --- a/uml2es/examples/declarativeCity/src/main/ml-config/rest-api.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "rest-api" : { - "name" : "%%NAME%%", - "group" : "%%GROUP%%", - "database" : "%%DATABASE%%", - "modules-database" : "%%MODULES_DATABASE%%", - "port" : %%PORT%%, - "xdbc-enabled" : true, - "error-format" : "json" - } -} diff --git a/uml2es/examples/declarativeCity/src/main/ml-modules/rest-properties.json b/uml2es/examples/declarativeCity/src/main/ml-modules/rest-properties.json deleted file mode 100755 index 9dce67d..0000000 --- a/uml2es/examples/declarativeCity/src/main/ml-modules/rest-properties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "debug" : false, - "validate-queries" : true, - "document-transform-all" : false, - "validate-options" : true -} diff --git a/uml2es/examples/decomposedModels/README.md b/uml2es/examples/decomposedModels/README.md new file mode 100644 index 0000000..ecd798a --- /dev/null +++ b/uml2es/examples/decomposedModels/README.md @@ -0,0 +1,25 @@ +- This is the ability to decompose a big model into smaller models. It's modularity, that idea. The example we show here is putting common classes for Contacts into a library model. We then build an HR model that uses classes from the Contact lib. +- Aspects of mapping to ES: +-> I need a way to specify an "include path" - where can I find dependent models? +-> In HR model, do I include contact classses or link them as external references? I think the former is better because I think DHF mapper will work better with it. Aside from DHF, external references are a bit harder to manage. + * Still, UML2ES should allow both + +- proposed flags on deploy: +embedOrLink=embed|link +dependentModelFiles=comma-sep list of dependent models; or else I just ask you deploy dependent models first... + * one thought on this; the tools link one model to another by GUID. So if HR model refers to Address class, it refers to the GUID of Address class in the contact lib model. Therefore, need to keep these GUIDs handy to check the reference + +- MagicDraw approach: + * Design contacts lib model. Ensure the classes (Address, etc) are in a package. Designate that package as Shared! + * Design main model for HR. Incorporate the contacts lib by doing "Use Model" option. Use "read-only" option: we want to use the classes but not modify them. You can now drag the contact lib classes into your diagram! + * See documentation: https://docs.nomagic.com/display/MD185/Using+other+projects+in+a+project +- include images D5*MD.png + +- Papyrus approach: + * Design contacts lib model as its own Papyrus project. + * Design main HR model as its own Papyrus project. Ensure you have Model Explorer view open. In Model Explorer, right-click on the HR model and select Import. From here import the contact lib model. You can now drag contact lib model classes into main model diagram! + * See useful video: https://www.youtube.com/watch?v=l7c1HORYyX8 +- include images D5*Pap.png + +- Remember to udpate build doc. New flags on deploy. +- Remember to update umlmapping doc. We now support multiple models. diff --git a/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/.project b/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/.project new file mode 100644 index 0000000..f8d6927 --- /dev/null +++ b/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/.project @@ -0,0 +1,11 @@ + + + D5_ContactObjects_Pap + + + + + + + + diff --git a/uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.di b/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.di similarity index 100% rename from uml2es/examples/declarativeCity/data/DeclarativeCity/DeclarativeCity.di rename to uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.di diff --git a/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.notation b/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.notation new file mode 100644 index 0000000..f7db279 --- /dev/null +++ b/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.notation @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.uml b/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.uml new file mode 100644 index 0000000..0521b32 --- /dev/null +++ b/uml2es/examples/decomposedModels/data/D5_ContactObjects_Pap/D5_ContactObjects_Pap/D5_ContactObjects_Pap.uml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uml2es/examples/gentest/papyrus/.project b/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/.project similarity index 88% rename from uml2es/examples/gentest/papyrus/.project rename to uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/.project index cf3f729..87028a5 100644 --- a/uml2es/examples/gentest/papyrus/.project +++ b/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/.project @@ -1,6 +1,6 @@ - GenModel + D5_HR_Pap diff --git a/uml2es/examples/gentest/papyrus/Maudle.di b/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.di similarity index 100% rename from uml2es/examples/gentest/papyrus/Maudle.di rename to uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.di diff --git a/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.notation b/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.notation new file mode 100644 index 0000000..33c61f1 --- /dev/null +++ b/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.notation @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.uml b/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.uml new file mode 100644 index 0000000..c9d9ad7 --- /dev/null +++ b/uml2es/examples/decomposedModels/data/D5_HR_Pap/D5_HR_Pap/D5_HR_Pap.uml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org,http://www.w3.org/ns/org# + + + foaf:Agent + + + org:OrganizationalUnit + + + + + + + + + + + + + + + + + diff --git a/uml2es/examples/gentest/README.md b/uml2es/examples/gentest/README.md deleted file mode 100644 index 2024a29..0000000 --- a/uml2es/examples/gentest/README.md +++ /dev/null @@ -1,2 +0,0 @@ -This is for testing only. - diff --git a/uml2es/examples/gentest/dhf/build.gradle b/uml2es/examples/gentest/dhf/build.gradle deleted file mode 100644 index 0fef91d..0000000 --- a/uml2es/examples/gentest/dhf/build.gradle +++ /dev/null @@ -1,136 +0,0 @@ -buildscript { - repositories { - maven {url 'http://developer.marklogic.com/maven2/'} - } -} - -plugins { - id 'java' - id 'eclipse' - id 'idea' - - // This plugin allows you to create different environments - // for your gradle deploy. Each environment is represented - // by a gradle-${env}.properties file - // See https://github.com/stevesaliman/gradle-properties-plugin - // specify the env on the command line with: - // gradle -PenvironmentName=x ... - id 'net.saliman.properties' version '1.4.6' - - // This gradle plugin extends the ml-gradle plugin with - // commands that make the Data Hub Framework do its magic - id 'com.marklogic.ml-data-hub' version '4.1.0' -} - -repositories { - jcenter() - maven {url 'http://developer.marklogic.com/maven2/'} - - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } - - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } -} - -configurations { - // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want - // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as - // shown below. Need to force to use certain version of xml-apis library. - mlcp { - resolutionStrategy { - force "xml-apis:xml-apis:1.4.01" - } - } -} - -dependencies { - // this allows you to write custom java code that depends - // on the Data Hub Framework library - compile 'com.marklogic:marklogic-data-hub:4.1.0' - compile 'com.marklogic:marklogic-xcc:9.0.7' - - mlcp "com.marklogic:mlcp:9.0.6" - mlcp "org.apache.commons:commons-csv:1.2" - mlcp files("lib") -} - -task includeXMI2ESTransform(type: Copy) { - from "../../../uml2esTransform/src/main/ml-modules/root/xmi2es" - into "src/main/ml-modules/root/xmi2es" -} - -task includeModel(type: Copy) { - from "../papyrus/Maudle.uml" - into "data/model" - rename '(.*).uml', '$1.xml' -} - -task includeUGradle() { - // Don't use Copy task bcuz file locking into gradle project dir on Windows - doLast { - copy { - from "../../../uml2esTransform/uml2es4dhf.gradle" - into "." - } - } -} - -task setup() { - dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') - dependsOn('includeUGradle') -} - -task loadXML(type: com.marklogic.gradle.task.MlcpTask) { - def dataDir = "${projectDir}"; - def unixDir = dataDir.replace('\\', '/'); - def regexDir = unixDir+"/data/xml"; - def regex = '"' + regexDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - host = mlHost - port = mlStagingPort.toInteger() - database = mlStagingDbName - - document_type = "xml" - input_file_path = "data/xml" - input_file_type = "documents" - - output_collections "GENXML,input" - output_permissions "rest-reader,read,rest-writer,update" - output_uri_replace = regex - output_uri_prefix = "/gen/xml/" - - transform_module="/data-hub/4/transforms/mlcp-flow-transform.xqy" - transform_namespace="http://marklogic.com/data-hub/mlcp-flow-transform" - transform_param "entity-name=A,flow-name=loadTestX" -} - -task loadJSON(type: com.marklogic.gradle.task.MlcpTask) { - def dataDir = "${projectDir}"; - def unixDir = dataDir.replace('\\', '/'); - def regexDir = unixDir+"/data/json"; - def regex = '"' + regexDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - host = mlHost - port = mlStagingPort.toInteger() - database = mlStagingDbName - - document_type = "json" - input_file_path = "data/json" - input_file_type = "documents" - - output_collections "GENJSON,input" - output_permissions "rest-reader,read,rest-writer,update" - output_uri_replace = regex - output_uri_prefix = "/gen/json/" - - transform_module="/data-hub/4/transforms/mlcp-flow-transform.sjs" - transform_namespace="http://marklogic.com/data-hub/mlcp-flow-transform" - transform_param "entity-name=A,flow-name=loadTestJ" -} diff --git a/uml2es/examples/gentest/dhf/data/json/test1.json b/uml2es/examples/gentest/dhf/data/json/test1.json deleted file mode 100644 index febff53..0000000 --- a/uml2es/examples/gentest/dhf/data/json/test1.json +++ /dev/null @@ -1 +0,0 @@ -{"data": "j"} diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/Ajj.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/Ajj.properties deleted file mode 100644 index ae7dab3..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/Ajj.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:03:46 EST 2018 -mainModule=main.sjs -collectorCodeFormat=sjs -mainCodeFormat=sjs -codeFormat=sjs -collectorModule=collector.sjs -dataFormat=json diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/collector.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/collector.sjs deleted file mode 100644 index 97c4a84..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/collector.sjs +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Collect IDs plugin - * - * @param options - a map containing options. Options are sent from Java - * - * @return - an array of ids or uris - */ -function collect(options) { - // by default we return the URIs in the same collection as the Entity name - return cts.uris(null, null, cts.collectionQuery("input")); -} - -module.exports = { - collect: collect -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/content.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/content.sjs deleted file mode 100644 index 72997b4..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/content.sjs +++ /dev/null @@ -1,140 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -'use strict' - -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -/* -* Create Content Plugin -* -* @param id - the identifier returned by the collector -* @param options - an object containing options. Options are sent from Java -* -* @return - your content -*/ -function createContent(id, options) { - let doc = cts.doc(id); - let ioptions = util.setIOptions(id,options); - - let source; - - // for xml we need to use xpath - if(doc && xdmp.nodeKind(doc) === 'element' && doc instanceof XMLDocument) { - source = doc - } - // for json we need to return the instance - else if(doc && doc instanceof Document) { - source = fn.head(doc.root); - } - // for everything else - else { - source = doc; - } - - return buildContent_A(id, source, options, ioptions); -} - - -/* - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -*/ -function buildContent_A(id,source,options,ioptions) { - - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'A', - '$version': '0.0.1' - }; - - -var data = id.endsWith(".xml") ? source.xpath("string(/data)") : source.toObject().data; - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ - ret["header"] = "ajj"; // type: string, req'd: true, array: false - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "json"; // type: string, req'd: true, array: false - -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "ajj" + data; // type: string, req'd: true, array: false - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_A_uri(id, ret, ioptions) - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/headers.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/headers.sjs deleted file mode 100644 index 0ed9177..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/headers.sjs +++ /dev/null @@ -1,24 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Headers Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an object of headers - */ -function createHeaders(id, content, options) { - var lang = "json"; - var ioptions = util.getIOptions(id,options); - return xesgen.setHeaders_A(id, content, ioptions, lang); - //return {}; - - // TODO nested headers -} - -module.exports = { - createHeaders: createHeaders -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/main.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/main.sjs deleted file mode 100644 index 4c523d5..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/main.sjs +++ /dev/null @@ -1,56 +0,0 @@ -// dhf.sjs exposes helper functions to make your life easier -// See documentation at: -// https://marklogic.github.io/marklogic-data-hub/docs/server-side/ -const dhf = require('/data-hub/4/dhf.sjs'); - -const contentPlugin = require('./content.sjs'); -const headersPlugin = require('./headers.sjs'); -const triplesPlugin = require('./triples.sjs'); -const writerPlugin = require('./writer.sjs'); - -/* - * Plugin Entry point - * - * @param id - the identifier returned by the collector - * @param options - a map containing options. Options are sent from Java - * - */ -function main(id, options) { - - xdmp.log("AJJ 1 " + id); - var contentContext = dhf.contentContext(); - var content = dhf.run(contentContext, function() { - return contentPlugin.createContent(id, options); - }); - - xdmp.log("AJJ 2 " + id + JSON.stringify(content)); - - var headerContext = dhf.headersContext(content); - var headers = dhf.run(headerContext, function() { - return headersPlugin.createHeaders(id, content, options); - }); - - xdmp.log("AJJ 3 " + id + JSON.stringify(headers)); - - var tripleContext = dhf.triplesContext(content, headers); - var triples = dhf.run(tripleContext, function() { - return triplesPlugin.createTriples(id, content, headers, options); - }); - - xdmp.log("AJJ 4 " + id ); - - var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat); - - xdmp.log("AJJ 5 " + id ); - - // writers must be invoked this way. - // see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer - dhf.runWriter(writerPlugin, id, envelope, options); - - xdmp.log("AJJ 6 " + id ); - -} - -module.exports = { - main: main -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/triples.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/triples.sjs deleted file mode 100644 index ad3a05d..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/triples.sjs +++ /dev/null @@ -1,25 +0,0 @@ -//const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Triples Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param headers - the output of your heaaders plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an array of triples - */ -function createTriples(id, content, headers, options) { - //var ioptions = util.getIOptions(id,options); - //return xesgen.setTriples_A(id, content, headers, ioptions); - return []; - - // TODO nested triples -} - -module.exports = { - createTriples: createTriples -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/writer.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/writer.sjs deleted file mode 100644 index 1c189e9..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajj/writer.sjs +++ /dev/null @@ -1,20 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/*~ - * Writer Plugin - * - * @param id - the identifier returned by the collector - * @param envelope - the final envelope - * @param options - an object options. Options are sent from Java - * - * @return - nothing - */ -function write(id, envelope, options) { - xesgen.runWriter_A(id, envelope, util.getIOptions(id,options)); - util.removeIOptions(id,options); - //xdmp.documentInsert(id, envelope, xdmp.defaultPermissions(), options.entity); - util.removeIOptions(id,options); -} - -module.exports = write; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/Ajx.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/Ajx.properties deleted file mode 100644 index 6b1550c..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/Ajx.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:03:46 EST 2018 -mainModule=main.sjs -collectorCodeFormat=sjs -mainCodeFormat=sjs -codeFormat=sjs -collectorModule=collector.sjs -dataFormat=xml diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/collector.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/collector.sjs deleted file mode 100644 index 97c4a84..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/collector.sjs +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Collect IDs plugin - * - * @param options - a map containing options. Options are sent from Java - * - * @return - an array of ids or uris - */ -function collect(options) { - // by default we return the URIs in the same collection as the Entity name - return cts.uris(null, null, cts.collectionQuery("input")); -} - -module.exports = { - collect: collect -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/content.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/content.sjs deleted file mode 100644 index 7874e34..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/content.sjs +++ /dev/null @@ -1,139 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -'use strict' - -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -/* -* Create Content Plugin -* -* @param id - the identifier returned by the collector -* @param options - an object containing options. Options are sent from Java -* -* @return - your content -*/ -function createContent(id, options) { - let doc = cts.doc(id); - let ioptions = util.setIOptions(id,options); - - let source; - - // for xml we need to use xpath - if(doc && xdmp.nodeKind(doc) === 'element' && doc instanceof XMLDocument) { - source = doc - } - // for json we need to return the instance - else if(doc && doc instanceof Document) { - source = fn.head(doc.root); - } - // for everything else - else { - source = doc; - } - - return buildContent_A(id, source, options, ioptions); -} - - -/* - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -*/ -function buildContent_A(id,source,options,ioptions) { - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'A', - '$version': '0.0.1' - }; - -var data = id.endsWith(".xml") ? source.xpath("string(/data)") : source.toObject().data; - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ - ret["header"] = "ajx"; // type: string, req'd: true, array: false - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "xml"; // type: string, req'd: true, array: false - -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "ajx" + data; // type: string, req'd: true, array: false - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_A_uri(id, ret, ioptions) - - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/headers.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/headers.sjs deleted file mode 100644 index 2ea94d2..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/headers.sjs +++ /dev/null @@ -1,24 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Headers Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an object of headers - */ -function createHeaders(id, content, options) { - var lang = "xml"; - var ioptions = util.getIOptions(id,options); - return xesgen.setHeaders_A(id, content, ioptions, lang); - //return {}; - - // TODO nested headers -} - -module.exports = { - createHeaders: createHeaders -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/main.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/main.sjs deleted file mode 100644 index 9afb452..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/main.sjs +++ /dev/null @@ -1,43 +0,0 @@ -// dhf.sjs exposes helper functions to make your life easier -// See documentation at: -// https://marklogic.github.io/marklogic-data-hub/docs/server-side/ -const dhf = require('/data-hub/4/dhf.sjs'); - -const contentPlugin = require('./content.sjs'); -const headersPlugin = require('./headers.sjs'); -const triplesPlugin = require('./triples.sjs'); -const writerPlugin = require('./writer.sjs'); - -/* - * Plugin Entry point - * - * @param id - the identifier returned by the collector - * @param options - a map containing options. Options are sent from Java - * - */ -function main(id, options) { - var contentContext = dhf.contentContext(); - var content = dhf.run(contentContext, function() { - return contentPlugin.createContent(id, options); - }); - - var headerContext = dhf.headersContext(content); - var headers = dhf.run(headerContext, function() { - return headersPlugin.createHeaders(id, content, options); - }); - - var tripleContext = dhf.triplesContext(content, headers); - var triples = dhf.run(tripleContext, function() { - return triplesPlugin.createTriples(id, content, headers, options); - }); - - var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat); - - // writers must be invoked this way. - // see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer - dhf.runWriter(writerPlugin, id, envelope, options); -} - -module.exports = { - main: main -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/triples.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/triples.sjs deleted file mode 100644 index ad3a05d..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/triples.sjs +++ /dev/null @@ -1,25 +0,0 @@ -//const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Triples Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param headers - the output of your heaaders plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an array of triples - */ -function createTriples(id, content, headers, options) { - //var ioptions = util.getIOptions(id,options); - //return xesgen.setTriples_A(id, content, headers, ioptions); - return []; - - // TODO nested triples -} - -module.exports = { - createTriples: createTriples -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/writer.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/writer.sjs deleted file mode 100644 index 1c189e9..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Ajx/writer.sjs +++ /dev/null @@ -1,20 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/*~ - * Writer Plugin - * - * @param id - the identifier returned by the collector - * @param envelope - the final envelope - * @param options - an object options. Options are sent from Java - * - * @return - nothing - */ -function write(id, envelope, options) { - xesgen.runWriter_A(id, envelope, util.getIOptions(id,options)); - util.removeIOptions(id,options); - //xdmp.documentInsert(id, envelope, xdmp.defaultPermissions(), options.entity); - util.removeIOptions(id,options); -} - -module.exports = write; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/Axj.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/Axj.properties deleted file mode 100644 index a74af6c..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/Axj.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:04:14 EST 2018 -mainModule=main.xqy -collectorCodeFormat=xqy -mainCodeFormat=xqy -codeFormat=xqy -collectorModule=collector.xqy -dataFormat=json diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/collector.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/collector.xqy deleted file mode 100644 index 80006f7..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/collector.xqy +++ /dev/null @@ -1,20 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -declare option xdmp:mapping "false"; - -(:~ - : Collect IDs plugin - : - : @param $options - a map containing options. Options are sent from Java - : - : @return - a sequence of ids or uris - :) -declare function plugin:collect( - $options as map:map) as xs:string* -{ - (: by default we return the URIs in the same collection as the Entity name :) - cts:uris((), (), cts:collection-query("input")) -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/content.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/content.xqy deleted file mode 100644 index cfc5156..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/content.xqy +++ /dev/null @@ -1,115 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Content Plugin - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - : @return - your transformed content - :) -declare function plugin:create-content( - $id as xs:string, - $options as map:map) as map:map -{ - let $ioptions := util:setIOptions($id,$options) - let $doc := fn:doc($id) - let $source := $doc - return plugin:buildContent_A($id, $source, $options, $ioptions) -}; - - -(: - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -:) -declare function plugin:buildContent_A($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'A'), - map:put($model, '$version', '0.0.1') - ) - -let $data := - if (fn:ends-with($id, ".json")) then $source/data - else $source/data/text() - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) - let $_ := map:put($model, "format", "json") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "header", "axj") (: type: string, req'd: true, array: false :) - -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "axj" || $data) (: type: string, req'd: true, array: false :) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_A_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/headers.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/headers.xqy deleted file mode 100644 index d38cd08..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/headers.xqy +++ /dev/null @@ -1,34 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Headers Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more header nodes - :) -declare function plugin:create-headers( - $id as xs:string, - $content as item()?, - $options as map:map) as node()* -{ - let $lang := "json" - - let $ioptions := util:getIOptions($id, $options) - return xesgen:setHeaders_A($id, $content, $ioptions, $lang) - - (:return ():) - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/main.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/main.xqy deleted file mode 100644 index 1574a4e..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/main.xqy +++ /dev/null @@ -1,55 +0,0 @@ -xquery version "1.0-ml"; - -(: Your plugin must be in this namespace for the DHF to recognize it:) -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(: - : This module exposes helper functions to make your life easier - : See documentation at: - : https://marklogic.github.io/marklogic-data-hub/docs/server-side/ - :) -import module namespace dhf = "http://marklogic.com/dhf" - at "/data-hub/4/dhf.xqy"; - -(: include modules to construct various parts of the envelope :) -import module namespace content = "http://marklogic.com/data-hub/plugins" at "content.xqy"; -import module namespace headers = "http://marklogic.com/data-hub/plugins" at "headers.xqy"; -import module namespace triples = "http://marklogic.com/data-hub/plugins" at "triples.xqy"; - -(: include the writer module which persists your envelope into MarkLogic :) -import module namespace writer = "http://marklogic.com/data-hub/plugins" at "writer.xqy"; - -declare option xdmp:mapping "false"; - -(:~ - : Plugin Entry point - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - :) -declare function plugin:main( - $id as xs:string, - $options as map:map) -{ - let $content-context := dhf:content-context() - let $content := dhf:run($content-context, function() { - content:create-content($id, $options) - }) - - let $header-context := dhf:headers-context($content) - let $headers := dhf:run($header-context, function() { - headers:create-headers($id, $content, $options) - }) - - let $triple-context := dhf:triples-context($content, $headers) - let $triples := dhf:run($triple-context, function() { - triples:create-triples($id, $content, $headers, $options) - }) - - let $envelope := dhf:make-envelope($content, $headers, $triples, map:get($options, "dataFormat")) - return - (: writers must be invoked this way. - see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer :) - dhf:run-writer(xdmp:function(xs:QName("writer:write")), $id, $envelope, $options) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/triples.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/triples.xqy deleted file mode 100644 index 6f2481e..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/triples.xqy +++ /dev/null @@ -1,35 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(:import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ;:) -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Triples Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $headers - the output of your headers plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more triples - :) -declare function plugin:create-triples( - $id as xs:string, - $content as item()?, - $headers as item()*, - $options as map:map) as sem:triple* -{ - (: - let $ioptions := util:getIOptions($id, $options) - return xesgen:setTriples_A($id, $content, $headers, $ioptions) - :) - () - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/writer.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/writer.xqy deleted file mode 100644 index c9d51a5..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axj/writer.xqy +++ /dev/null @@ -1,29 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare option xdmp:mapping "false"; - -(:~ - : Writer Plugin - : - : @param $id - the identifier returned by the collector - : @param $envelope - the final envelope - : @param $options - a map containing options. Options are sent from Java - : - : @return - nothing - :) -declare function plugin:write( - $id as xs:string, - $envelope as item(), - $options as map:map) as empty-sequence() -{ - ( - xesgen:runWriter_A($id, $envelope, util:getIOptions($id,$options)) - (:xdmp:document-insert($id, $envelope, xdmp:default-permissions(), map:get($options, "entity")):) - , util:removeIOptions($id,$options) - ) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/Axx.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/Axx.properties deleted file mode 100644 index 1f7f16a..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/Axx.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:04:14 EST 2018 -mainModule=main.xqy -collectorCodeFormat=xqy -mainCodeFormat=xqy -codeFormat=xqy -collectorModule=collector.xqy -dataFormat=xml diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/collector.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/collector.xqy deleted file mode 100644 index 80006f7..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/collector.xqy +++ /dev/null @@ -1,20 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -declare option xdmp:mapping "false"; - -(:~ - : Collect IDs plugin - : - : @param $options - a map containing options. Options are sent from Java - : - : @return - a sequence of ids or uris - :) -declare function plugin:collect( - $options as map:map) as xs:string* -{ - (: by default we return the URIs in the same collection as the Entity name :) - cts:uris((), (), cts:collection-query("input")) -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/content.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/content.xqy deleted file mode 100644 index 468424a..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/content.xqy +++ /dev/null @@ -1,115 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Content Plugin - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - : @return - your transformed content - :) -declare function plugin:create-content( - $id as xs:string, - $options as map:map) as map:map -{ - let $ioptions := util:setIOptions($id,$options) - let $doc := fn:doc($id) - let $source := $doc - return plugin:buildContent_A($id, $source, $options, $ioptions) -}; - - -(: - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -:) -declare function plugin:buildContent_A($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'A'), - map:put($model, '$version', '0.0.1') - ) - -let $data := - if (fn:ends-with($id, ".json")) then $source/data - else $source/data/text() - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) - let $_ := map:put($model, "format", "xml") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "header", "axx") (: type: string, req'd: true, array: false :) - -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "axx" || $data) (: type: string, req'd: true, array: false :) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_A_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/headers.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/headers.xqy deleted file mode 100644 index 9f76ccd..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/headers.xqy +++ /dev/null @@ -1,34 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Headers Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more header nodes - :) -declare function plugin:create-headers( - $id as xs:string, - $content as item()?, - $options as map:map) as node()* -{ - let $lang := "xml" - - let $ioptions := util:getIOptions($id, $options) - return xesgen:setHeaders_A($id, $content, $ioptions, $lang) - - (:return ():) - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/main.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/main.xqy deleted file mode 100644 index 1574a4e..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/main.xqy +++ /dev/null @@ -1,55 +0,0 @@ -xquery version "1.0-ml"; - -(: Your plugin must be in this namespace for the DHF to recognize it:) -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(: - : This module exposes helper functions to make your life easier - : See documentation at: - : https://marklogic.github.io/marklogic-data-hub/docs/server-side/ - :) -import module namespace dhf = "http://marklogic.com/dhf" - at "/data-hub/4/dhf.xqy"; - -(: include modules to construct various parts of the envelope :) -import module namespace content = "http://marklogic.com/data-hub/plugins" at "content.xqy"; -import module namespace headers = "http://marklogic.com/data-hub/plugins" at "headers.xqy"; -import module namespace triples = "http://marklogic.com/data-hub/plugins" at "triples.xqy"; - -(: include the writer module which persists your envelope into MarkLogic :) -import module namespace writer = "http://marklogic.com/data-hub/plugins" at "writer.xqy"; - -declare option xdmp:mapping "false"; - -(:~ - : Plugin Entry point - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - :) -declare function plugin:main( - $id as xs:string, - $options as map:map) -{ - let $content-context := dhf:content-context() - let $content := dhf:run($content-context, function() { - content:create-content($id, $options) - }) - - let $header-context := dhf:headers-context($content) - let $headers := dhf:run($header-context, function() { - headers:create-headers($id, $content, $options) - }) - - let $triple-context := dhf:triples-context($content, $headers) - let $triples := dhf:run($triple-context, function() { - triples:create-triples($id, $content, $headers, $options) - }) - - let $envelope := dhf:make-envelope($content, $headers, $triples, map:get($options, "dataFormat")) - return - (: writers must be invoked this way. - see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer :) - dhf:run-writer(xdmp:function(xs:QName("writer:write")), $id, $envelope, $options) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/triples.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/triples.xqy deleted file mode 100644 index 6f2481e..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/triples.xqy +++ /dev/null @@ -1,35 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(:import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ;:) -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Triples Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $headers - the output of your headers plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more triples - :) -declare function plugin:create-triples( - $id as xs:string, - $content as item()?, - $headers as item()*, - $options as map:map) as sem:triple* -{ - (: - let $ioptions := util:getIOptions($id, $options) - return xesgen:setTriples_A($id, $content, $headers, $ioptions) - :) - () - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/writer.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/writer.xqy deleted file mode 100644 index c9d51a5..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/A/harmonize/Axx/writer.xqy +++ /dev/null @@ -1,29 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare option xdmp:mapping "false"; - -(:~ - : Writer Plugin - : - : @param $id - the identifier returned by the collector - : @param $envelope - the final envelope - : @param $options - a map containing options. Options are sent from Java - : - : @return - nothing - :) -declare function plugin:write( - $id as xs:string, - $envelope as item(), - $options as map:map) as empty-sequence() -{ - ( - xesgen:runWriter_A($id, $envelope, util:getIOptions($id,$options)) - (:xdmp:document-insert($id, $envelope, xdmp:default-permissions(), map:get($options, "entity")):) - , util:removeIOptions($id,$options) - ) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/Bjj.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/Bjj.properties deleted file mode 100644 index ae7dab3..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/Bjj.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:03:46 EST 2018 -mainModule=main.sjs -collectorCodeFormat=sjs -mainCodeFormat=sjs -codeFormat=sjs -collectorModule=collector.sjs -dataFormat=json diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/collector.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/collector.sjs deleted file mode 100644 index 97c4a84..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/collector.sjs +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Collect IDs plugin - * - * @param options - a map containing options. Options are sent from Java - * - * @return - an array of ids or uris - */ -function collect(options) { - // by default we return the URIs in the same collection as the Entity name - return cts.uris(null, null, cts.collectionQuery("input")); -} - -module.exports = { - collect: collect -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/content.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/content.sjs deleted file mode 100644 index 914d768..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/content.sjs +++ /dev/null @@ -1,177 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -'use strict' - -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -/* -* Create Content Plugin -* -* @param id - the identifier returned by the collector -* @param options - an object containing options. Options are sent from Java -* -* @return - your content -*/ -function createContent(id, options) { - let doc = cts.doc(id); - let ioptions = util.setIOptions(id,options); - - let source; - - // for xml we need to use xpath - if(doc && xdmp.nodeKind(doc) === 'element' && doc instanceof XMLDocument) { - source = doc - } - // for json we need to return the instance - else if(doc && doc instanceof Document) { - source = fn.head(doc.root); - } - // for everything else - else { - source = doc; - } - - return buildContent_B(id, source, options, ioptions); -} - - -/* - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -*/ -function buildContent_B(id,source,options,ioptions) { - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'B', - '$version': '0.0.1' - }; - -var data = id.endsWith(".xml") ? source.xpath("string(/data)") : source.toObject().data; - -/* - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["b"] = "bjjb"; // type: string, req'd: true, array: false - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "json"; // type: string, req'd: true, array: false - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "bjj" + data; // type: string, req'd: true, array: false - -/* - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_a(id, ret, ioptions) - -/* - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_c(id, ret, ioptions) - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_B_uri(id, ret, ioptions) - - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/headers.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/headers.sjs deleted file mode 100644 index 3caa9d1..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/headers.sjs +++ /dev/null @@ -1,24 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Headers Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an object of headers - */ -function createHeaders(id, content, options) { - var lang = "json"; - var ioptions = util.getIOptions(id,options); - return xesgen.setHeaders_B(id, content, ioptions, lang); - //return {}; - - // TODO nested headers -} - -module.exports = { - createHeaders: createHeaders -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/main.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/main.sjs deleted file mode 100644 index 9afb452..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/main.sjs +++ /dev/null @@ -1,43 +0,0 @@ -// dhf.sjs exposes helper functions to make your life easier -// See documentation at: -// https://marklogic.github.io/marklogic-data-hub/docs/server-side/ -const dhf = require('/data-hub/4/dhf.sjs'); - -const contentPlugin = require('./content.sjs'); -const headersPlugin = require('./headers.sjs'); -const triplesPlugin = require('./triples.sjs'); -const writerPlugin = require('./writer.sjs'); - -/* - * Plugin Entry point - * - * @param id - the identifier returned by the collector - * @param options - a map containing options. Options are sent from Java - * - */ -function main(id, options) { - var contentContext = dhf.contentContext(); - var content = dhf.run(contentContext, function() { - return contentPlugin.createContent(id, options); - }); - - var headerContext = dhf.headersContext(content); - var headers = dhf.run(headerContext, function() { - return headersPlugin.createHeaders(id, content, options); - }); - - var tripleContext = dhf.triplesContext(content, headers); - var triples = dhf.run(tripleContext, function() { - return triplesPlugin.createTriples(id, content, headers, options); - }); - - var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat); - - // writers must be invoked this way. - // see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer - dhf.runWriter(writerPlugin, id, envelope, options); -} - -module.exports = { - main: main -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/triples.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/triples.sjs deleted file mode 100644 index dda65c0..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/triples.sjs +++ /dev/null @@ -1,25 +0,0 @@ -//const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Triples Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param headers - the output of your heaaders plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an array of triples - */ -function createTriples(id, content, headers, options) { - //var ioptions = util.getIOptions(id,options); - //return xesgen.setTriples_B(id, content, headers, ioptions); - return []; - - // TODO nested triples -} - -module.exports = { - createTriples: createTriples -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/writer.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/writer.sjs deleted file mode 100644 index e939d94..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjj/writer.sjs +++ /dev/null @@ -1,20 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/*~ - * Writer Plugin - * - * @param id - the identifier returned by the collector - * @param envelope - the final envelope - * @param options - an object options. Options are sent from Java - * - * @return - nothing - */ -function write(id, envelope, options) { - xesgen.runWriter_B(id, envelope, util.getIOptions(id,options)); - util.removeIOptions(id,options); - //xdmp.documentInsert(id, envelope, xdmp.defaultPermissions(), options.entity); - util.removeIOptions(id,options); -} - -module.exports = write; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/Bjx.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/Bjx.properties deleted file mode 100644 index 6b1550c..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/Bjx.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:03:46 EST 2018 -mainModule=main.sjs -collectorCodeFormat=sjs -mainCodeFormat=sjs -codeFormat=sjs -collectorModule=collector.sjs -dataFormat=xml diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/collector.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/collector.sjs deleted file mode 100644 index 97c4a84..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/collector.sjs +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Collect IDs plugin - * - * @param options - a map containing options. Options are sent from Java - * - * @return - an array of ids or uris - */ -function collect(options) { - // by default we return the URIs in the same collection as the Entity name - return cts.uris(null, null, cts.collectionQuery("input")); -} - -module.exports = { - collect: collect -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/content.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/content.sjs deleted file mode 100644 index 72c6010..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/content.sjs +++ /dev/null @@ -1,177 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -'use strict' - -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -/* -* Create Content Plugin -* -* @param id - the identifier returned by the collector -* @param options - an object containing options. Options are sent from Java -* -* @return - your content -*/ -function createContent(id, options) { - let doc = cts.doc(id); - let ioptions = util.setIOptions(id,options); - - let source; - - // for xml we need to use xpath - if(doc && xdmp.nodeKind(doc) === 'element' && doc instanceof XMLDocument) { - source = doc - } - // for json we need to return the instance - else if(doc && doc instanceof Document) { - source = fn.head(doc.root); - } - // for everything else - else { - source = doc; - } - - return buildContent_B(id, source, options, ioptions); -} - - -/* - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -*/ -function buildContent_B(id,source,options,ioptions) { - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'B', - '$version': '0.0.1' - }; - -var data = id.endsWith(".xml") ? source.xpath("string(/data)") : source.toObject().data; - -/* - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["b"] = "bjxb"; // type: string, req'd: true, array: false - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "xml"; // type: string, req'd: true, array: false - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "bjx" + data; // type: string, req'd: true, array: false - -/* - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_a(id, ret, ioptions) - -/* - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_c(id, ret, ioptions) - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_B_uri(id, ret, ioptions) - - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/headers.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/headers.sjs deleted file mode 100644 index 02ef2c8..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/headers.sjs +++ /dev/null @@ -1,24 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Headers Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an object of headers - */ -function createHeaders(id, content, options) { - var lang = "xml"; - var ioptions = util.getIOptions(id,options); - return xesgen.setHeaders_B(id, content, ioptions, lang); - //return {}; - - // TODO nested headers -} - -module.exports = { - createHeaders: createHeaders -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/main.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/main.sjs deleted file mode 100644 index 9afb452..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/main.sjs +++ /dev/null @@ -1,43 +0,0 @@ -// dhf.sjs exposes helper functions to make your life easier -// See documentation at: -// https://marklogic.github.io/marklogic-data-hub/docs/server-side/ -const dhf = require('/data-hub/4/dhf.sjs'); - -const contentPlugin = require('./content.sjs'); -const headersPlugin = require('./headers.sjs'); -const triplesPlugin = require('./triples.sjs'); -const writerPlugin = require('./writer.sjs'); - -/* - * Plugin Entry point - * - * @param id - the identifier returned by the collector - * @param options - a map containing options. Options are sent from Java - * - */ -function main(id, options) { - var contentContext = dhf.contentContext(); - var content = dhf.run(contentContext, function() { - return contentPlugin.createContent(id, options); - }); - - var headerContext = dhf.headersContext(content); - var headers = dhf.run(headerContext, function() { - return headersPlugin.createHeaders(id, content, options); - }); - - var tripleContext = dhf.triplesContext(content, headers); - var triples = dhf.run(tripleContext, function() { - return triplesPlugin.createTriples(id, content, headers, options); - }); - - var envelope = dhf.makeEnvelope(content, headers, triples, options.dataFormat); - - // writers must be invoked this way. - // see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer - dhf.runWriter(writerPlugin, id, envelope, options); -} - -module.exports = { - main: main -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/triples.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/triples.sjs deleted file mode 100644 index dda65c0..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/triples.sjs +++ /dev/null @@ -1,25 +0,0 @@ -//const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/* - * Create Triples Plugin - * - * @param id - the identifier returned by the collector - * @param content - the output of your content plugin - * @param headers - the output of your heaaders plugin - * @param options - an object containing options. Options are sent from Java - * - * @return - an array of triples - */ -function createTriples(id, content, headers, options) { - //var ioptions = util.getIOptions(id,options); - //return xesgen.setTriples_B(id, content, headers, ioptions); - return []; - - // TODO nested triples -} - -module.exports = { - createTriples: createTriples -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/writer.sjs b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/writer.sjs deleted file mode 100644 index e939d94..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bjx/writer.sjs +++ /dev/null @@ -1,20 +0,0 @@ -const xesgen = require("/modelgen/Maudle/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - -/*~ - * Writer Plugin - * - * @param id - the identifier returned by the collector - * @param envelope - the final envelope - * @param options - an object options. Options are sent from Java - * - * @return - nothing - */ -function write(id, envelope, options) { - xesgen.runWriter_B(id, envelope, util.getIOptions(id,options)); - util.removeIOptions(id,options); - //xdmp.documentInsert(id, envelope, xdmp.defaultPermissions(), options.entity); - util.removeIOptions(id,options); -} - -module.exports = write; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/Bxj.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/Bxj.properties deleted file mode 100644 index a74af6c..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/Bxj.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:04:14 EST 2018 -mainModule=main.xqy -collectorCodeFormat=xqy -mainCodeFormat=xqy -codeFormat=xqy -collectorModule=collector.xqy -dataFormat=json diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/collector.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/collector.xqy deleted file mode 100644 index 80006f7..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/collector.xqy +++ /dev/null @@ -1,20 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -declare option xdmp:mapping "false"; - -(:~ - : Collect IDs plugin - : - : @param $options - a map containing options. Options are sent from Java - : - : @return - a sequence of ids or uris - :) -declare function plugin:collect( - $options as map:map) as xs:string* -{ - (: by default we return the URIs in the same collection as the Entity name :) - cts:uris((), (), cts:collection-query("input")) -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/content.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/content.xqy deleted file mode 100644 index 53bbd89..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/content.xqy +++ /dev/null @@ -1,152 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Content Plugin - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - : @return - your transformed content - :) -declare function plugin:create-content( - $id as xs:string, - $options as map:map) as map:map -{ - let $ioptions := util:setIOptions($id,$options) - let $doc := fn:doc($id) - let $source := $doc - return plugin:buildContent_B($id, $source, $options, $ioptions) -}; - - -(: - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -:) -declare function plugin:buildContent_B($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'B'), - map:put($model, '$version', '0.0.1') - ) -let $data := - if (fn:ends-with($id, ".json")) then $source/data - else $source/data/text() - -(: - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "b", "bxjb") (: type: string, req'd: true, array: false :) - -(: - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "format", "json") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "bxj" || $data) (: type: string, req'd: true, array: false :) - -(: - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_a($id, $model, $ioptions) - -(: - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_c($id, $model, $ioptions) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/headers.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/headers.xqy deleted file mode 100644 index 1512577..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/headers.xqy +++ /dev/null @@ -1,34 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Headers Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more header nodes - :) -declare function plugin:create-headers( - $id as xs:string, - $content as item()?, - $options as map:map) as node()* -{ - let $lang := "json" - - let $ioptions := util:getIOptions($id, $options) - return xesgen:setHeaders_B($id, $content, $ioptions, $lang) - - (:return ():) - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/main.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/main.xqy deleted file mode 100644 index 1574a4e..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/main.xqy +++ /dev/null @@ -1,55 +0,0 @@ -xquery version "1.0-ml"; - -(: Your plugin must be in this namespace for the DHF to recognize it:) -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(: - : This module exposes helper functions to make your life easier - : See documentation at: - : https://marklogic.github.io/marklogic-data-hub/docs/server-side/ - :) -import module namespace dhf = "http://marklogic.com/dhf" - at "/data-hub/4/dhf.xqy"; - -(: include modules to construct various parts of the envelope :) -import module namespace content = "http://marklogic.com/data-hub/plugins" at "content.xqy"; -import module namespace headers = "http://marklogic.com/data-hub/plugins" at "headers.xqy"; -import module namespace triples = "http://marklogic.com/data-hub/plugins" at "triples.xqy"; - -(: include the writer module which persists your envelope into MarkLogic :) -import module namespace writer = "http://marklogic.com/data-hub/plugins" at "writer.xqy"; - -declare option xdmp:mapping "false"; - -(:~ - : Plugin Entry point - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - :) -declare function plugin:main( - $id as xs:string, - $options as map:map) -{ - let $content-context := dhf:content-context() - let $content := dhf:run($content-context, function() { - content:create-content($id, $options) - }) - - let $header-context := dhf:headers-context($content) - let $headers := dhf:run($header-context, function() { - headers:create-headers($id, $content, $options) - }) - - let $triple-context := dhf:triples-context($content, $headers) - let $triples := dhf:run($triple-context, function() { - triples:create-triples($id, $content, $headers, $options) - }) - - let $envelope := dhf:make-envelope($content, $headers, $triples, map:get($options, "dataFormat")) - return - (: writers must be invoked this way. - see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer :) - dhf:run-writer(xdmp:function(xs:QName("writer:write")), $id, $envelope, $options) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/triples.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/triples.xqy deleted file mode 100644 index 191e250..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/triples.xqy +++ /dev/null @@ -1,35 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(:import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ;:) -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Triples Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $headers - the output of your headers plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more triples - :) -declare function plugin:create-triples( - $id as xs:string, - $content as item()?, - $headers as item()*, - $options as map:map) as sem:triple* -{ - (: - let $ioptions := util:getIOptions($id, $options) - return xesgen:setTriples_B($id, $content, $headers, $ioptions) - :) - () - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/writer.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/writer.xqy deleted file mode 100644 index 7dde0f8..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxj/writer.xqy +++ /dev/null @@ -1,29 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare option xdmp:mapping "false"; - -(:~ - : Writer Plugin - : - : @param $id - the identifier returned by the collector - : @param $envelope - the final envelope - : @param $options - a map containing options. Options are sent from Java - : - : @return - nothing - :) -declare function plugin:write( - $id as xs:string, - $envelope as item(), - $options as map:map) as empty-sequence() -{ - ( - xesgen:runWriter_B($id, $envelope, util:getIOptions($id,$options)) - (:xdmp:document-insert($id, $envelope, xdmp:default-permissions(), map:get($options, "entity")):) - , util:removeIOptions($id,$options) - ) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/Bxx.properties b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/Bxx.properties deleted file mode 100644 index 1f7f16a..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/Bxx.properties +++ /dev/null @@ -1,8 +0,0 @@ -# -#Fri Dec 28 09:04:14 EST 2018 -mainModule=main.xqy -collectorCodeFormat=xqy -mainCodeFormat=xqy -codeFormat=xqy -collectorModule=collector.xqy -dataFormat=xml diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/collector.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/collector.xqy deleted file mode 100644 index 80006f7..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/collector.xqy +++ /dev/null @@ -1,20 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -declare option xdmp:mapping "false"; - -(:~ - : Collect IDs plugin - : - : @param $options - a map containing options. Options are sent from Java - : - : @return - a sequence of ids or uris - :) -declare function plugin:collect( - $options as map:map) as xs:string* -{ - (: by default we return the URIs in the same collection as the Entity name :) - cts:uris((), (), cts:collection-query("input")) -}; - diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/content.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/content.xqy deleted file mode 100644 index 6e8e2f5..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/content.xqy +++ /dev/null @@ -1,153 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Content Plugin - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - : @return - your transformed content - :) -declare function plugin:create-content( - $id as xs:string, - $options as map:map) as map:map -{ - let $ioptions := util:setIOptions($id,$options) - let $doc := fn:doc($id) - let $source := $doc - return plugin:buildContent_B($id, $source, $options, $ioptions) -}; - - -(: - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -:) -declare function plugin:buildContent_B($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'B'), - map:put($model, '$version', '0.0.1') - ) - -let $data := - if (fn:ends-with($id, ".json")) then $source/data - else $source/data/text() - -(: - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "b", "bxxb") (: type: string, req'd: true, array: false :) - -(: - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "format", "xml") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "bxx" || $data) (: type: string, req'd: true, array: false :) - -(: - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_a($id, $model, $ioptions) - -(: - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_c($id, $model, $ioptions) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/headers.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/headers.xqy deleted file mode 100644 index 490184d..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/headers.xqy +++ /dev/null @@ -1,34 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Headers Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more header nodes - :) -declare function plugin:create-headers( - $id as xs:string, - $content as item()?, - $options as map:map) as node()* -{ - let $lang := "xml" - - let $ioptions := util:getIOptions($id, $options) - return xesgen:setHeaders_B($id, $content, $ioptions, $lang) - - (:return ():) - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/main.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/main.xqy deleted file mode 100644 index 1574a4e..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/main.xqy +++ /dev/null @@ -1,55 +0,0 @@ -xquery version "1.0-ml"; - -(: Your plugin must be in this namespace for the DHF to recognize it:) -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(: - : This module exposes helper functions to make your life easier - : See documentation at: - : https://marklogic.github.io/marklogic-data-hub/docs/server-side/ - :) -import module namespace dhf = "http://marklogic.com/dhf" - at "/data-hub/4/dhf.xqy"; - -(: include modules to construct various parts of the envelope :) -import module namespace content = "http://marklogic.com/data-hub/plugins" at "content.xqy"; -import module namespace headers = "http://marklogic.com/data-hub/plugins" at "headers.xqy"; -import module namespace triples = "http://marklogic.com/data-hub/plugins" at "triples.xqy"; - -(: include the writer module which persists your envelope into MarkLogic :) -import module namespace writer = "http://marklogic.com/data-hub/plugins" at "writer.xqy"; - -declare option xdmp:mapping "false"; - -(:~ - : Plugin Entry point - : - : @param $id - the identifier returned by the collector - : @param $options - a map containing options. Options are sent from Java - : - :) -declare function plugin:main( - $id as xs:string, - $options as map:map) -{ - let $content-context := dhf:content-context() - let $content := dhf:run($content-context, function() { - content:create-content($id, $options) - }) - - let $header-context := dhf:headers-context($content) - let $headers := dhf:run($header-context, function() { - headers:create-headers($id, $content, $options) - }) - - let $triple-context := dhf:triples-context($content, $headers) - let $triples := dhf:run($triple-context, function() { - triples:create-triples($id, $content, $headers, $options) - }) - - let $envelope := dhf:make-envelope($content, $headers, $triples, map:get($options, "dataFormat")) - return - (: writers must be invoked this way. - see: https://github.com/marklogic/marklogic-data-hub/wiki/dhf-lib#run-writer :) - dhf:run-writer(xdmp:function(xs:QName("writer:write")), $id, $envelope, $options) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/triples.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/triples.xqy deleted file mode 100644 index 191e250..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/triples.xqy +++ /dev/null @@ -1,35 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -(:import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ;:) -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare namespace es = "http://marklogic.com/entity-services"; - -declare option xdmp:mapping "false"; - -(:~ - : Create Triples Plugin - : - : @param $id - the identifier returned by the collector - : @param $content - the output of your content plugin - : @param $headers - the output of your headers plugin - : @param $options - a map containing options. Options are sent from Java - : - : @return - zero or more triples - :) -declare function plugin:create-triples( - $id as xs:string, - $content as item()?, - $headers as item()*, - $options as map:map) as sem:triple* -{ - (: - let $ioptions := util:getIOptions($id, $options) - return xesgen:setTriples_B($id, $content, $headers, $ioptions) - :) - () - - (: TODO - nested :) -}; diff --git a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/writer.xqy b/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/writer.xqy deleted file mode 100644 index 7dde0f8..0000000 --- a/uml2es/examples/gentest/dhf/data/tweaks/entities/B/harmonize/Bxx/writer.xqy +++ /dev/null @@ -1,29 +0,0 @@ -xquery version "1.0-ml"; - -module namespace plugin = "http://marklogic.com/data-hub/plugins"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; -import module namespace util = "http://marklogic.com/xmi2es/util" at "/xmi2es/util.xqy" ; - -declare option xdmp:mapping "false"; - -(:~ - : Writer Plugin - : - : @param $id - the identifier returned by the collector - : @param $envelope - the final envelope - : @param $options - a map containing options. Options are sent from Java - : - : @return - nothing - :) -declare function plugin:write( - $id as xs:string, - $envelope as item(), - $options as map:map) as empty-sequence() -{ - ( - xesgen:runWriter_B($id, $envelope, util:getIOptions($id,$options)) - (:xdmp:document-insert($id, $envelope, xdmp:default-permissions(), map:get($options, "entity")):) - , util:removeIOptions($id,$options) - ) -}; diff --git a/uml2es/examples/gentest/dhf/data/xml/test1.xml b/uml2es/examples/gentest/dhf/data/xml/test1.xml deleted file mode 100644 index 5fbfecb..0000000 --- a/uml2es/examples/gentest/dhf/data/xml/test1.xml +++ /dev/null @@ -1,4 +0,0 @@ - - -x - diff --git a/uml2es/examples/gentest/dhf/gradle.properties b/uml2es/examples/gentest/dhf/gradle.properties deleted file mode 100644 index bd7b2d1..0000000 --- a/uml2es/examples/gentest/dhf/gradle.properties +++ /dev/null @@ -1,73 +0,0 @@ -mlDHFVersion=4.1.0 -mlHost=localhost -mlUsername=admin -mlPassword=admin - -mlStagingAppserverName=xmi2es-examples-gendata-dhf-STAGING -mlStagingPort=27300 -mlStagingDbName=xmi2es-examples-gendata-dhf-STAGING -mlStagingForestsPerHost=3 -mlStagingAuth=digest -# To enable SSL for staging -# mlStagingSimpleSsl=true - -mlFinalAppserverName=xmi2es-examples-gendata-dhf-FINAL -mlFinalPort=27301 -mlFinalDbName=xmi2es-examples-gendata-dhf-FINAL -mlFinalForestsPerHost=3 -mlFinalAuth=digest -# To enable SSL for final -# mlFinalSimpleSsl=true - -mlJobAppserverName=xmi2es-examples-gendata-dhf-JOBS -mlJobPort=27303 -mlJobDbName=xmi2es-examples-gendata-dhf-JOBS -mlJobForestsPerHost=4 -mlJobAuth=digest -# To enable SSL for jobs -# mlJobSimpleSsl=true - -mlModulesDbName=xmi2es-examples-gendata-dhf-MODULES -mlModulesForestsPerHost=1 - -mlStagingTriggersDbName=xmi2es-examples-gendata-dhf-staging-TRIGGERS -mlStagingTriggersForestsPerHost=1 - -mlStagingSchemasDbName=xmi2es-examples-gendata-dhf-staging-SCHEMAS -mlStagingSchemasForestsPerHost=1 - -mlFinalTriggersDbName=xmi2es-examples-gendata-dhf-final-TRIGGERS -mlFinalTriggersForestsPerHost=1 - -mlFinalSchemasDbName=xmi2es-examples-gendata-dhf-final-SCHEMAS -mlFinalSchemasForestsPerHost=1 - -# You can override this to specify an alternate folder for your -# custom forest info. Defaults to user-config/forests/ -# mlCustomForestPath=forests - -# The name of the Role to create for Hub Access -mlHubUserRole=data-hub-role -mlHubUserName=data-hub-user -# this password is autogenerated for you via the 'gradle hubInit' task -mlHubUserPassword=g?E)I^h67^hH{QqN2jY[ - -# The name of the role to create for hub deployment/development -mlHubAdminRole=hub-admin-role -mlHubAdminUserName=hub-admin-user -mlHubAdminUserPassword=?t4K$z-W5gjb@PI31(wj - -# Deprecated property -# If you are working with a load balancer please indicate so using -# property "mlIsHostLoadBalancer" -# When "mlIsHostLoadBalancer" is set to "true", the value specified for "mlHost" will be used as the load balancer. -# You do not need to explicitly set the value of "mlLoadBalancerHosts" but if you do it must match the value of the property "mlHost" -# mlLoadBalancerHosts=your-load-balancer-hostname - -# Default module permissions which allow data-hub-role to execute flows -mlModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,data-hub-role,read,data-hub-role,execute - -# If DHF is running in a provisioned environment please specify it here -# mlIsProvisionedEnvironment=false - -modelName=Maudle diff --git a/uml2es/examples/gentest/dhf/lib/log4j.properties b/uml2es/examples/gentest/dhf/lib/log4j.properties deleted file mode 100644 index e7e9930..0000000 --- a/uml2es/examples/gentest/dhf/lib/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -#root logger option -log4j.rootLogger=INFO, stdout - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - diff --git a/uml2es/examples/gentest/papyrus/Maudle.notation b/uml2es/examples/gentest/papyrus/Maudle.notation deleted file mode 100644 index dce0d13..0000000 --- a/uml2es/examples/gentest/papyrus/Maudle.notation +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uml2es/examples/gentest/papyrus/Maudle.uml b/uml2es/examples/gentest/papyrus/Maudle.uml deleted file mode 100644 index c8bcdbe..0000000 --- a/uml2es/examples/gentest/papyrus/Maudle.uml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A - Maudle - - - B - Maudle - - - - - "/" - $attribute(id) - "." - $attribute(format) - - - - - - "/" - $attribute(id) - "." - $attribute(format) - - - - - - $attribute(a) - $attribute(b) - - - - $attribute(format) - - diff --git a/uml2es/examples/gentest/vanilla/README.md b/uml2es/examples/gentest/vanilla/README.md deleted file mode 100644 index f2042fa..0000000 --- a/uml2es/examples/gentest/vanilla/README.md +++ /dev/null @@ -1,23 +0,0 @@ -gradle -i setup mlDeploy -gradle -i -b uml2es.gradle uDeployModel - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=A -PdataFormat=xml -PpluginFormat=xqy -PcontentMode=es -Poverwrite=true -PmoduleName=Axx - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=A -PdataFormat=xml -PpluginFormat=sjs -PcontentMode=es -Poverwrite=true -PmoduleName=Ajx - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=A -PdataFormat=json -PpluginFormat=sjs -PcontentMode=es -Poverwrite=true -PmoduleName=Ajj - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=A -PdataFormat=json -PpluginFormat=xqy -PcontentMode=es -Poverwrite=true -PmoduleName=Axj - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=B -PdataFormat=xml -PpluginFormat=xqy -PcontentMode=es -Poverwrite=true -PmoduleName=Bxx - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=B -PdataFormat=xml -PpluginFormat=sjs -PcontentMode=es -Poverwrite=true -PmoduleName=Bjx - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=B -PdataFormat=json -PpluginFormat=sjs -PcontentMode=es -Poverwrite=true -PmoduleName=Bjj - -gradle -b uml2es.gradle -i uCreateConversionModule -PentityName=B -PdataFormat=json -PpluginFormat=xqy -PcontentMode=es -Poverwrite=true -PmoduleName=Bxj - --in data/tweaks are the tweaks, copy them over the code that was just generated in plugins -- then redploy the modules - -test using the workspace \ No newline at end of file diff --git a/uml2es/examples/gentest/vanilla/XMI2ESGenDataVanilla.xml b/uml2es/examples/gentest/vanilla/XMI2ESGenDataVanilla.xml deleted file mode 100644 index d4194b8..0000000 --- a/uml2es/examples/gentest/vanilla/XMI2ESGenDataVanilla.xml +++ /dev/null @@ -1,125 +0,0 @@ -xquery version "1.0-ml"; - -xdmp:document-insert("/testx.xml", <envelope><instance><data>x</data></instance></envelope>) - -'use strict'; - -declareUpdate(); - -xdmp.documentInsert("/testj.json", {"envelope": {"instance": {"data": "j"}}}); - -'use strict'; - -const ajj = require("/esconversion/Maudle/A/Ajj.sjs"); -const ajx = require("/esconversion/Maudle/A/Ajx.sjs"); -const bjj = require("/esconversion/Maudle/B/Bjj.sjs"); -const bjx = require("/esconversion/Maudle/B/Bjx.sjs"); - -var options, ret; -var results = []; - -options = {}; -ret = ajj.createContent("/testj.json", cts.doc("/testj.json"), options); -results.push("ajj"); -results.push(ret); -results.push(options); - -options = {}; -ret = ajj.createContent("/testx.xml", cts.doc("/testx.xml"), options); -results.push("ajj"); -results.push(ret); -results.push(options); - -options = {}; -ret = ajx.createContent("/testx.xml", cts.doc("/testx.xml"), options); -results.push("ajx"); -results.push(ret); -results.push(options); - -options = {}; -ret = ajx.createContent("/testj.json", cts.doc("/testj.json"), options); -results.push("ajx"); -results.push(ret); -results.push(options); - -options = {}; -ret = bjj.createContent("/testj.json", cts.doc("/testj.json"), options); -results.push("bjj"); -results.push(ret); -results.push(options); - -options = {}; -ret = bjj.createContent("/testx.xml", cts.doc("/testx.xml"), options); -results.push("bjj"); -results.push(ret); -results.push(options); - -options = {}; -ret = bjx.createContent("/testx.xml", cts.doc("/testx.xml"), options); -results.push("bjx"); -results.push(ret); -results.push(options); - -options = {}; -ret = bjx.createContent("/testj.json", cts.doc("/testj.json"), options); -results.push("bjx"); -results.push(ret); -results.push(options); - -results; -import module namespace axj = "http://marklogic.com/data-hub/plugins/Axj" at "/esconversion/Maudle/A/Axj.xqy" ; -import module namespace axx = "http://marklogic.com/data-hub/plugins/Axx" at "/esconversion/Maudle/A/Axx.xqy" ; -import module namespace bxj = "http://marklogic.com/data-hub/plugins/Bxj" at "/esconversion/Maudle/B/Bxj.xqy" ; -import module namespace bxx = "http://marklogic.com/data-hub/plugins/Bxx" at "/esconversion/Maudle/B/Bxx.xqy" ; - -let $axj-options := map:map() -let $axj-ret := axj:buildContent_A("/testj.json",fn:doc("/testj.json"),$axj-options,$axj-options) - -let $axjx-options := map:map() -let $axjx-ret := axj:buildContent_A("/testx.xml",fn:doc("/testx.xml"),$axjx-options,$axjx-options) - -let $axx-options := map:map() -let $axx-ret := axx:buildContent_A("/testx.xml",fn:doc("/testx.xml"),$axx-options,$axx-options) - -let $axxj-options := map:map() -let $axxj-ret := axx:buildContent_A("/testj.json",fn:doc("/testj.json"),$axxj-options,$axxj-options) - -let $bxj-options := map:map() -let $bxj-ret := bxj:buildContent_B("/testj.json",fn:doc("/testj.json"),$bxj-options,$bxj-options) - -let $bxjx-options := map:map() -let $bxjx-ret := bxj:buildContent_B("/testx.xml",fn:doc("/testx.xml"),$bxjx-options,$bxjx-options) - -let $bxx-options := map:map() -let $bxx-ret := bxx:buildContent_B("/testx.xml",fn:doc("/testx.xml"),$bxx-options,$bxx-options) - -let $bxxj-options := map:map() -let $bxxj-ret := bxx:buildContent_B("/testj.json",fn:doc("/testj.json"),$bxxj-options,$bxxj-options) - -return -( - "axj", - $axj-ret, - $axj-options, - "axjx", - $axjx-ret, - $axjx-options, - "axx", - $axx-ret, - $axx-options, - "axxj", - $axxj-ret, - $axxj-options, - "bxj", - $bxj-ret, - $bxj-options, - "bxjx", - $bxjx-ret, - $bxjx-options, - "bxx", - $bxx-ret, - $bxx-options, - "bxxj", - $bxxj-ret, - $bxxj-options -) diff --git a/uml2es/examples/gentest/vanilla/build.gradle b/uml2es/examples/gentest/vanilla/build.gradle deleted file mode 100755 index 2a1c2ad..0000000 --- a/uml2es/examples/gentest/vanilla/build.gradle +++ /dev/null @@ -1,75 +0,0 @@ -buildscript { - - repositories { - jcenter{url "http://jcenter.bintray.com/"} - mavenLocal() - maven { url "http://plugins.gradle.org/m2" } - } - dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" - classpath "net.saliman:gradle-properties-plugin:1.4.6" - } -} - -apply plugin: "net.saliman.properties" -apply plugin: "com.marklogic.ml-gradle" - -repositories { - jcenter{url "http://jcenter.bintray.com/"} - - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } - - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } -} - -configurations { - // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want - // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as - // shown below. Need to force to use certain version of xml-apis library. - mlcp { - resolutionStrategy { - force "xml-apis:xml-apis:1.4.01" - } - } -} - -dependencies { - mlcp "com.marklogic:mlcp:9.0.6" - mlcp "org.apache.commons:commons-csv:1.2" - mlcp files("lib") -} - -task includeXMI2ESTransform(type: Copy) { - from "../../../uml2esTransform/src/main/ml-modules/root/xmi2es" - into "src/main/ml-modules/root/xmi2es" -} - -task includeModel(type: Copy) { - from "../papyrus/Maudle.uml" - into "data/model" - rename '(.*).uml', '$1.xml' -} - -task includeUGradle() { - // Don't use Copy task bcuz file locking into gradle project dir on Windows - doLast { - copy { - from "../../../uml2esTransform/uml2es.gradle" - into "." - } - } -} - -task setup() { - dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') - dependsOn('includeUGradle') -} - - - - - diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Ajj.sjs b/uml2es/examples/gentest/vanilla/data/tweaks/Ajj.sjs deleted file mode 100644 index e665186..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Ajj.sjs +++ /dev/null @@ -1,112 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -const xesgen = require("/modelgen/Maudle/lib.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -var options = {}; - -function createContent(id,source, options) { - return buildContent_A(id, source, options, options); -} - - -/* - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -*/ -function buildContent_A(id,source,options,ioptions) { - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'A', - '$version': '0.0.1' - }; - - var sampleData = id.endsWith(".xml") ? source.xpath("string(/envelope/instance/data)") : source.toObject().envelope.instance.data; - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "json"; // type: string, req'd: true, array: false - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ - ret["header"] = "Ajj"; // type: string, req'd: true, array: false - -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "Ajj_" + sampleData; // type: string, req'd: true, array: false - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_A_uri(id, ret, ioptions) - - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Ajx.sjs b/uml2es/examples/gentest/vanilla/data/tweaks/Ajx.sjs deleted file mode 100644 index 528bb7d..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Ajx.sjs +++ /dev/null @@ -1,113 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -const xesgen = require("/modelgen/Maudle/lib.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -var options = {}; - -function createContent(id,source, options) { - return buildContent_A(id, source, options, options); -} - - -/* - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -*/ -function buildContent_A(id,source,options,ioptions) { - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'A', - '$version': '0.0.1' - }; - - var sampleData = id.endsWith(".xml") ? source.xpath("string(/envelope/instance/data)") : source.toObject().envelope.instance.data; - - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "xml"; // type: string, req'd: true, array: false - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ - ret["header"] = "Ajx"; // type: string, req'd: true, array: false - -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "Ajx_" + sampleData; // type: string, req'd: true, array: false - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_A_uri(id, ret, ioptions) - - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Axj.xqy b/uml2es/examples/gentest/vanilla/data/tweaks/Axj.xqy deleted file mode 100644 index 29049c8..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Axj.xqy +++ /dev/null @@ -1,94 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version '1.0-ml'; - -module namespace plugin = "http://marklogic.com/data-hub/plugins/Axj"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; - -declare option xdmp:mapping 'false'; - - -(: - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -:) -declare function plugin:buildContent_A($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'A'), - map:put($model, '$version', '0.0.1') - ) - -let $sampleData := - if (fn:ends-with($id, ".json")) then $source/data - else $source/text() - -(: - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "format", "json") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) - let $_ := map:put($model, "header", "Axj") (: type: string, req'd: true, array: false :) - -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "Axj" || $sampleData) (: type: string, req'd: true, array: false :) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_A_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Axx.xqy b/uml2es/examples/gentest/vanilla/data/tweaks/Axx.xqy deleted file mode 100644 index 3403f07..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Axx.xqy +++ /dev/null @@ -1,94 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version '1.0-ml'; - -module namespace plugin = "http://marklogic.com/data-hub/plugins/Axx"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; - -declare option xdmp:mapping 'false'; - - -(: - Class A is stereotyped in the model as follows:: - collections: - A, - Maudle -:) -declare function plugin:buildContent_A($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'A'), - map:put($model, '$version', '0.0.1') - ) - -let $sampleData := - if (fn:ends-with($id, ".json")) then $source/data - else $source/text() - -(: - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "format", "xml") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) - let $_ := map:put($model, "header", "Axx") (: type: string, req'd: true, array: false :) - -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "Axx" || $sampleData) (: type: string, req'd: true, array: false :) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_A_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Bjj.sjs b/uml2es/examples/gentest/vanilla/data/tweaks/Bjj.sjs deleted file mode 100644 index b700978..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Bjj.sjs +++ /dev/null @@ -1,150 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -const xesgen = require("/modelgen/Maudle/lib.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -var options = {}; - -function createContent(id,source, options) { - return buildContent_B(id, source, options, options); -} - - -/* - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -*/ -function buildContent_B(id,source,options,ioptions) { - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'B', - '$version': '0.0.1' - }; - - var sampleData = id.endsWith(".xml") ? source.xpath("string(/envelope/instance/data)") : source.toObject().envelope.instance.data; - -/* - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["b"] = "Bjjb" + sampleData; // type: string, req'd: true, array: false - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "json"; // type: string, req'd: true, array: false - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "Bjj" + sampleData; // type: string, req'd: true, array: false - -/* - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_a(id, ret, ioptions) - -/* - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_c(id, ret, ioptions) - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_B_uri(id, ret, ioptions) - - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Bjx.sjs b/uml2es/examples/gentest/vanilla/data/tweaks/Bjx.sjs deleted file mode 100644 index 4bb657d..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Bjx.sjs +++ /dev/null @@ -1,150 +0,0 @@ -/* - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -*/ - -const xesgen = require("/modelgen/Maudle/lib.sjs"); - -/* -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = ""; -function getDMMapper(options) { - if (!options.mapper) { - const ctx = dm.newCompilerContext(DM_MAPPING_CONFIG_URI); - const mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} -*/ - -var options = {}; - -function createContent(id,source, options) { - return buildContent_B(id, source, options, options); -} - - -/* - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -*/ -function buildContent_B(id,source,options,ioptions) { - // now check to see if we have XML or json, then create a node clone from the root of the instance - if (source instanceof Element || source instanceof ObjectNode) { - let instancePath = '/*:envelope/*:instance'; - if(source instanceof Element) { - //make sure we grab content root only - instancePath += '/node()[not(. instance of processing-instruction() or . instance of comment())]'; - } - source = new NodeBuilder().addNode(fn.head(source.xpath(instancePath))).toNode(); - } - else{ - source = new NodeBuilder().addNode(fn.head(source)).toNode(); - } - - var ret = { - '$type': 'B', - '$version': '0.0.1' - }; - - var sampleData = id.endsWith(".xml") ? source.xpath("string(/envelope/instance/data)") : source.toObject().envelope.instance.data; - -/* - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["b"] = "Bjxb"; // type: string, req'd: true, array: false - -/* - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["format"] = "xml"; // type: string, req'd: true, array: false - -/* - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -*/ -/* - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -*/ - ret["id"] = "Bjx" + sampleData; // type: string, req'd: true, array: false - -/* - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_a(id, ret, ioptions) - -/* - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -*/ - xesgen.doCalculation_B_c(id, ret, ioptions) - -/* - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -*/ - xesgen.doCalculation_B_uri(id, ret, ioptions) - - return ret; -} - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Bxj.xqy b/uml2es/examples/gentest/vanilla/data/tweaks/Bxj.xqy deleted file mode 100644 index e12433b..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Bxj.xqy +++ /dev/null @@ -1,133 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version '1.0-ml'; - -module namespace plugin = "http://marklogic.com/data-hub/plugins/Bxj"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; - -declare option xdmp:mapping 'false'; - - -(: - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -:) -declare function plugin:buildContent_B($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'B'), - map:put($model, '$version', '0.0.1') - ) - -let $sampleData := - if (fn:ends-with($id, ".json")) then $source/data - else $source/text() - - -(: - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "b", "Bxjb") (: type: string, req'd: true, array: false :) - -(: - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "format", "json") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "Bxj" || $sampleData) (: type: string, req'd: true, array: false :) - -(: - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_a($id, $model, $ioptions) - -(: - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_c($id, $model, $ioptions) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/vanilla/data/tweaks/Bxx.xqy b/uml2es/examples/gentest/vanilla/data/tweaks/Bxx.xqy deleted file mode 100644 index a692fec..0000000 --- a/uml2es/examples/gentest/vanilla/data/tweaks/Bxx.xqy +++ /dev/null @@ -1,133 +0,0 @@ -(: - Model http://jude.org/maudle/Maudle-0.0.1 is stereotyped in the model as follows:: - hasFunction: - doCalculation_A_uri, - doCalculation_B_a, - doCalculation_B_c, - doCalculation_B_uri, - runWriter_A, - runWriter_B, - setHeaders_A, - setHeaders_B -:) - -xquery version '1.0-ml'; - -module namespace plugin = "http://marklogic.com/data-hub/plugins/Bxx"; - -import module namespace xesgen = "http://jude.org/maudle/Maudle-0.0.1" at "/modelgen/Maudle/lib.xqy" ; - -declare option xdmp:mapping 'false'; - - -(: - Class B is stereotyped in the model as follows:: - collections: - B, - Maudle - , - excludes: - http://jude.org/maudle/Maudle-0.0.1/B/a, - http://jude.org/maudle/Maudle-0.0.1/B/header, - http://jude.org/maudle/Maudle-0.0.1/B/uri -:) -declare function plugin:buildContent_B($id,$source,$options,$ioptions) { - let $source := - if ($source/*:envelope and $source/node() instance of element()) then - $source/*:envelope/*:instance/node() - else if ($source/*:envelope) then - $source/*:envelope/*:instance - else if ($source/instance) then - $source/instance - else - $source - let $model := json:object() - let $_ := ( - map:put($model, '$type', 'B'), - map:put($model, '$version', '0.0.1') - ) - -let $sampleData := - if (fn:ends-with($id, ".json")) then $source/data - else $source/text() - - -(: - Attribute b is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "b", "Bxxb") (: type: string, req'd: true, array: false :) - -(: - Attribute format is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "format", "xml") (: type: string, req'd: true, array: false :) - -(: - Attribute header is stereotyped in the model as follows:: - header: - headerFromContent - , - resolvedType: - string -:) -(: - Attribute id is stereotyped in the model as follows:: - resolvedType: - string -:) - let $_ := map:put($model, "id", "Bxx" || $sampleData) (: type: string, req'd: true, array: false :) - -(: - Attribute a is stereotyped in the model as follows:: - basedOnAttribute: - format - , - calculation: - $attribute(format) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_a($id, $model, $ioptions) - -(: - Attribute c is stereotyped in the model as follows:: - basedOnAttribute: - a, - b - , - calculation: - $attribute(a), - $attribute(b) - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_c($id, $model, $ioptions) - -(: - Attribute uri is stereotyped in the model as follows:: - basedOnAttribute: - format, - id - , - calculation: - \/\, - $attribute(id), - \.\, - $attribute(format) - , - isURI: - true - , - resolvedType: - string -:) - let $_ := xesgen:doCalculation_B_uri($id, $model, $ioptions) - - return $model -}; diff --git a/uml2es/examples/gentest/vanilla/gradle.properties b/uml2es/examples/gentest/vanilla/gradle.properties deleted file mode 100755 index a8a33f1..0000000 --- a/uml2es/examples/gentest/vanilla/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -mlAppName=xmi2es-examples-gentest-vanilla -mlHost=localhost -mlUsername=admin -mlPassword=admin -mlRestPort=21969 -mlAppServicesPort=21969 -mlAppServicesHost=localhost -mlTestRestPort=21869 - -modelName=Maudle diff --git a/uml2es/examples/gentest/vanilla/lib/log4j.properties b/uml2es/examples/gentest/vanilla/lib/log4j.properties deleted file mode 100644 index e7e9930..0000000 --- a/uml2es/examples/gentest/vanilla/lib/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -#root logger option -log4j.rootLogger=INFO, stdout - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - diff --git a/uml2es/examples/gentest/vanilla/src/main/ml-config/databases/initial/content-database.json b/uml2es/examples/gentest/vanilla/src/main/ml-config/databases/initial/content-database.json deleted file mode 100644 index ad9bfd1..0000000 --- a/uml2es/examples/gentest/vanilla/src/main/ml-config/databases/initial/content-database.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "database-name":"%%DATABASE%%", - "schema-database":"%%SCHEMAS_DATABASE%%", - "path-namespace":[{"prefix":"es", "namespace-uri":"http://marklogic.com/entity-services"}], - "range-element-index":[], - "triple-index":true, - "collection-lexicon":true -} diff --git a/uml2es/examples/gentest/vanilla/src/main/ml-config/databases/schemas-database.json b/uml2es/examples/gentest/vanilla/src/main/ml-config/databases/schemas-database.json deleted file mode 100644 index 1361cb5..0000000 --- a/uml2es/examples/gentest/vanilla/src/main/ml-config/databases/schemas-database.json +++ /dev/null @@ -1 +0,0 @@ -{"database-name": "%%SCHEMAS_DATABASE%%"} \ No newline at end of file diff --git a/uml2es/examples/gentest/vanilla/src/main/ml-config/rest-api.json b/uml2es/examples/gentest/vanilla/src/main/ml-config/rest-api.json deleted file mode 100755 index d671a93..0000000 --- a/uml2es/examples/gentest/vanilla/src/main/ml-config/rest-api.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "rest-api" : { - "name" : "%%NAME%%", - "group" : "%%GROUP%%", - "database" : "%%DATABASE%%", - "modules-database" : "%%MODULES_DATABASE%%", - "port" : %%PORT%%, - "xdbc-enabled" : true, - "error-format" : "json" - } -} diff --git a/uml2es/examples/gentest/vanilla/src/main/ml-modules/rest-properties.json b/uml2es/examples/gentest/vanilla/src/main/ml-modules/rest-properties.json deleted file mode 100755 index 9dce67d..0000000 --- a/uml2es/examples/gentest/vanilla/src/main/ml-modules/rest-properties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "debug" : false, - "validate-queries" : true, - "document-transform-all" : false, - "validate-options" : true -} diff --git a/uml2es/examples/hr/README.md b/uml2es/examples/hr/README.md index 7ff4b4b..75ca19e 100644 --- a/uml2es/examples/hr/README.md +++ b/uml2es/examples/hr/README.md @@ -1,5 +1,15 @@ # Human Resources Example +## Version Note + +This is the example presented in the blog post . It is designed for Marklogic Data Hub Framework 4.1. + +If you're on version 5.1 or higher of Data Hub, please refer to the following examples. (TODO - these are not ready. Coming soon.) + +[../hrHub5](../hrHub5) - This example upgraded for DHF 5.1. It shows the use of a TDE template to generate the semantic triples! +[../hrHub5_mdModelLibs](../hrHub5) - This example upgraded for DHF 5.1 with a MagicDraw main model that uses a separate library model. Demonstrates parent/child models in MagicDraw. +[../hrHub5_papModelLibs](../hrHub5) - This example upgraded for DHF 5.1 with a Papyrus main model that uses a separate library model. Demonstrates parent/child models in Papyrus. + ## Intro This example shows the following: @@ -86,7 +96,7 @@ Our project uses gradle. Before running, view the settings in gradle.properties. We will start simple, setting up the basic hub. Run the following: -gradle -PenvironmentName=local -i setup mlDeploy +gradle -i setup mlDeploy Confirm: - No errors in gradle output @@ -109,7 +119,7 @@ Confirm: Next, move our UML model into ML as an ES model. Run the following: -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i -PmodelName=DHFEmployeeSample uDeployModel +gradle -b uml2es4dhf4.gradle -i -PmodelFile=../umlModels/DHFEmployeeSample.xml uDeployModel Confirm: - Final DB (xmi2es-examples-hr-FINAL) includes the following documents @@ -132,7 +142,7 @@ Among the results, you should see the following: ### Create DHF Entities From the HR Model Now we create our DHF entity plugins. We leverage's the toolkit's ability to cut/generate code. First, ask the toolkit to create the basic plugins (without any flows). It will infer which classes in the model should be plugins. -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i uCreateDHFEntities -PmodelName=DHFEmployeeSample -PentitySelect=infer +gradle -b uml2es4dhf4.gradle -i uCreateDHFEntities -PmodelFile=../umlModels/DHFEmployeeSample.xml -PentitySelect=infer Confirm: - In gradle project there are new folders @@ -143,11 +153,11 @@ Confirm: For your newly created Employee and Department entities you need input flows for ingestion of source data. Run the following standard DHF gradle commands to create these flows. -gradle -PenvironmentName=local -i hubCreateInputFlow -PentityName=Employee -PflowName=LoadEmployee -PdataFormat=xml -PpluginFormat=xqy -PuseES=false +gradle -i hubCreateInputFlow -PentityName=Employee -PflowName=LoadEmployee -PdataFormat=xml -PpluginFormat=xqy -PuseES=false -gradle -PenvironmentName=local -i hubCreateInputFlow -PentityName=Department -PflowName=LoadDepartment -PdataFormat=xml -PpluginFormat=xqy -PuseES=false +gradle -i hubCreateInputFlow -PentityName=Department -PflowName=LoadDepartment -PdataFormat=xml -PpluginFormat=xqy -PuseES=false -gradle -PenvironmentName=local -i mlReloadModules +gradle -i mlReloadModules Confirm: - In your local gradle project you have newly generated code under plugins/entities/Employee/input and plugins/entities/Department/input @@ -159,7 +169,7 @@ Ingest staging data and some triples for FINAL Run the following: -gradle -PenvironmentName=local -i loadSummaryOrgTriples runInputMLCP +gradle -i loadSummaryOrgTriples runInputMLCP Confirm: - In STAGING (xmi2es-examples-hr-STAGING) we now have 2008 or more documents. Of these: @@ -173,9 +183,9 @@ Confirm: We have two Excel mapping spec documents in data/mapping folder. One has mapping instructions for Global, the other has mapping instructions for ACME. We'll make use of these when generating the harmonization code. For now, load them into MarkLogic. Run the following: -gradle -b uml2es4dhf.gradle -Pdiscover=true -PspecName=acme-mapping uLoadMappingSpec +gradle -b uml2es4dhf4.gradle -Pdiscover=true -PspecFile=data/mapping/acme-mapping.xlsx uLoadMappingSpec -gradle -b uml2es4dhf.gradle -Pdiscover=true -PspecName=global-mapping uLoadMappingSpec +gradle -b uml2es4dhf4.gradle -Pdiscover=true -PspecName=data/mapping/global-mapping.xlsx uLoadMappingSpec Confirm: - Final DB (xmi2es-examples-hr-FINAL) includes the following documents @@ -192,11 +202,11 @@ Confirm: ### Create Harmonization Flows We now ask the toolkit for generate harmonization flows. We need three harmonization flows: one to build a Department from Global source data, one to build an Employee from Global source data, and one to build an Employee from ACME source data. We will use the toolkit's DHF cookie cutter to generate harmonizations for each. Run the following: -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i uCreateDHFHarmonizeFlow -PmodelName=DHFEmployeeSample -PflowName=harmonizeES -PentityName=Department -PpluginFormat=xqy -PdataFormat=xml -PcontentMode=es -PmappingSpec=/xmi2es/excel-mapper/global-mapping.json +gradle -b uml2es4dhf4.gradle -i uCreateDHFHarmonizeFlow -PmodelFile=../umlModels/DHFEmployeeSample.xml -PflowName=harmonizeES -PentityName=Department -PpluginFormat=xqy -PdataFormat=xml -PcontentMode=es -PmappingSpec=/xmi2es/excel-mapper/global-mapping.json -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i uCreateDHFHarmonizeFlow -PmodelName=DHFEmployeeSample -PflowName=harmonizeESGlobal -PentityName=Employee -PpluginFormat=xqy -PdataFormat=xml -PcontentMode=es -PmappingSpec=/xmi2es/excel-mapper/global-mapping.json -PmappingSpec=/xmi2es/excel-mapper/global-mapping.json +gradle -b uml2es4dhf4.gradle -i uCreateDHFHarmonizeFlow -PmodelFile=../umlModels/DHFEmployeeSample.xml -PflowName=harmonizeESGlobal -PentityName=Employee -PpluginFormat=xqy -PdataFormat=xml -PcontentMode=es -PmappingSpec=/xmi2es/excel-mapper/global-mapping.json -PmappingSpec=/xmi2es/excel-mapper/global-mapping.json -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i uCreateDHFHarmonizeFlow -PmodelName=DHFEmployeeSample -PflowName=harmonizeESAcme -PentityName=Employee -PpluginFormat=xqy -PdataFormat=xml -PcontentMode=es -PmappingSpec=/xmi2es/excel-mapper/acme-mapping.json -PmappingSpec=/xmi2es/excel-mapper/acme-mapping.json +gradle -b uml2es4dhf4.gradle -i uCreateDHFHarmonizeFlow -PmodelFile=../umlModels/DHFEmployeeSample.xml -PflowName=harmonizeESAcme -PentityName=Employee -PpluginFormat=xqy -PdataFormat=xml -PcontentMode=es -PmappingSpec=/xmi2es/excel-mapper/acme-mapping.json -PmappingSpec=/xmi2es/excel-mapper/acme-mapping.json Confirm: - In your local gradle project you have newly generated code under plugins/entities/Employee/harmonize/harmonizeESAcme, plugins/entities/Employee/harmonize/harmonizeESGlobal and plugins/entities/Department/harmonize/harmonizeES. @@ -209,7 +219,7 @@ Confirm: We now tweak the content modules of the generation harmonization. We cooked those beforehand; they're in data/tweaks. Let's overwrite the generated code and deploy the changes. (These steps are automated through gradle, but we recommend you open the generated and tweaked code in your favorite diff tool and eyeball the differences.) -gradle -PenvironmentName=local -i tweakHarmonization mlReloadModules +gradle -i tweakHarmonization mlReloadModules Confirm: - The code in plugins/entities/Department/harmonization and plugins/entities/Employee/harmonization has the tweaks. @@ -219,11 +229,11 @@ Run harmonization to move employee and department data to FINAL. Run the following: -gradle -PenvironmentName=local -i hubRunFlow -PentityName=Department -PflowName=harmonizeES +gradle -i hubRunFlow -PentityName=Department -PflowName=harmonizeES -gradle -PenvironmentName=local -i hubRunFlow -PentityName=Employee -PflowName=harmonizeESAcme +gradle -i hubRunFlow -PentityName=Employee -PflowName=harmonizeESAcme -gradle -PenvironmentName=local -i hubRunFlow -PentityName=Employee -PflowName=harmonizeESGlobal +gradle -i hubRunFlow -PentityName=Employee -PflowName=harmonizeESGlobal Confirm: FINAL now contains: @@ -233,7 +243,7 @@ FINAL now contains: ### Extra Credit: Compare Cookie-Cutter Harmonizations with DHF ES Harmonizations Data Hub Framework, like our toolkit, can generate harmonization code that produces content based on an Entity Services model. Let's use DHF's hubCreaeHarmonizeFlow task to create an Employee harmonization. -gradle -PenvironmentName=local -i hubCreateHarmonizeFlow -PflowName=sampleHarmonizeDHF -PentityName=Employee -PpluginFormat=xqy -PdataFormat=xml -PuseES=true +gradle -i hubCreateHarmonizeFlow -PflowName=sampleHarmonizeDHF -PentityName=Employee -PpluginFormat=xqy -PdataFormat=xml -PuseES=true Confirm: - Check in local project for new folder plugins/entities/Employee/harmonize/sampleHarmonizeDHF diff --git a/uml2es/examples/hr/build.gradle b/uml2es/examples/hr/build.gradle index 921fef5..11fe049 100644 --- a/uml2es/examples/hr/build.gradle +++ b/uml2es/examples/hr/build.gradle @@ -195,21 +195,14 @@ task includeUGradle() { // Don't use Copy task bcuz file locking into gradle project dir on Windows doLast { copy { - from "../../uml2esTransform/uml2es4dhf.gradle" + from "../../uml2esTransform/uml2es4dhf4.gradle" into "." } } } -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/DHFEmployeeSample.xml" - into "data/model" -} - task setup() { dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') dependsOn('includeUGradle') } diff --git a/uml2es/examples/hr/src/main/entity-config/final-entity-options.xml b/uml2es/examples/hr/src/main/entity-config/final-entity-options.xml index 78c1174..9e26dfe 100644 --- a/uml2es/examples/hr/src/main/entity-config/final-entity-options.xml +++ b/uml2es/examples/hr/src/main/entity-config/final-entity-options.xml @@ -1,40 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - unfiltered - - - //*:instance/(Department|Employee) - - - - true - - - \ No newline at end of file +{} \ No newline at end of file diff --git a/uml2es/examples/hr/src/main/entity-config/staging-entity-options.xml b/uml2es/examples/hr/src/main/entity-config/staging-entity-options.xml index 78c1174..9e26dfe 100644 --- a/uml2es/examples/hr/src/main/entity-config/staging-entity-options.xml +++ b/uml2es/examples/hr/src/main/entity-config/staging-entity-options.xml @@ -1,40 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - unfiltered - - - //*:instance/(Department|Employee) - - - - true - - - \ No newline at end of file +{} \ No newline at end of file diff --git a/uml2es/examples/hrdm/README.md b/uml2es/examples/hrdm/README.md deleted file mode 100644 index ce9f5fc..0000000 --- a/uml2es/examples/hrdm/README.md +++ /dev/null @@ -1,138 +0,0 @@ -# Human Resources Using Declarative Mapper (MarkLogic Internal) - -## Intro - -This is a MarkLogic-internal example that shows harmonization using Declarative Mapper rather than Entity Services. - -In this example, we use the model from the [../hr](../hr) example: - -![DHFEmployeeSample](../umlModels/DHFEmployeeSample.png) - -Using UML2ES, we generate a DHF harmonization process that uses a Declarative Mapper template to map employee source data to the Employee class form in the UML model. - -## How to run: - -### Obtain Declarative Mapper - -DM is on MarkLogic's internal BitBucket. The repo is https://project.marklogic.com/repo/scm/int/declarative-mapper.git. Clone the json-sc branch. Then copy from your DM clone the directory declarative-mapper/src/main/ml-modules/root/ext to the HR examples' src/main/ml-modules/root/ext. Do it so that in HR example you have the file src/main/ml-modules/root/ext/declarative-mapper.sjs. - -cp -r $DMDIR/declarative-mapper/src/main/ml-modules/root/ext $HRDIR/src/main/ml-modules/root - -### Setup and Initialize Hub - -The next step kills two employees with one stone! Get into the hrdrm gradle project the UML2ES toolkit, the employee model, the HR GlobalCorp source data. Then standup the hrdm hub: - -gradle -i -PenvironmentName=local setup mlDeploy - -Confirm: - -- You have new databases, including xmi2es-examples-hr-FINAL and xmi2es-examples-hr-STAGING. -- You have new app servers, including xmi2es-examples-hrdm-FINAL -- You have local file data/mapping/global-mapping.xlsx -- You have local file data/model/DHFEmployeeSample.xml (slightly modified to calculate URI as .json rather than .xml) -- You have the local directory data/hr -- You have local file uml2es4dhf.gradle -- Your xmi2es-examples-hr-MODULES database includes the following modules: - * /ext/declarative-mapper.sjs (Declarative Mapper) - * /xmi2es/cookieCutter.sjs (a UML2ES module) - -### Load and Transform the HR UML Model - -Next, move our UML model into ML as an ES model. Run the following: - -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i -PmodelName=DHFEmployeeSample uDeployModel - -Confirm: -- Final DB (xmi2es-examples-hrdm-FINAL) includes the following documents - * /marklogic.com/entity-services/models/DHFEmployeeSample.json (The deployed ES model) - * /xmi2es/findings/DHFEmployeeSample.xml (Problems found during transformation. Check it. Confirm no issues.) - -### Create DHF Entities From the HR Model -Now we create our DHF entity plugins. We leverage's the toolkit's ability to cut/generate code. First, ask the toolkit to create the basic plugins (without any flows). It will infer which classes in the model should be plugins. - -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i uCreateDHFEntities -PmodelName=DHFEmployeeSample -PentitySelect=infer - -Confirm: -- In gradle project there are new folders - * plugins/entities/Department - * plugins/entities/Employee - -### Create Input Flow For Source Data - -For your newly created Employee entity you need an input flow for ingestion of source data. Run the following standard DHF gradle commands to create these flows. - -gradle -PenvironmentName=local -i hubCreateInputFlow -PentityName=Employee -PflowName=LoadEmployee -PdataFormat=json -PpluginFormat=sjs -PuseES=false - -gradle -PenvironmentName=local -i mlReloadModules - -Confirm: -- In your local gradle project you have newly generated code under plugins/entities/Employee/input a -- These new modules are visible in the modules database (xmi2es-examples-hrdm-MODULES) - -### Ingest - -Ingest staging data and some triples for FINAL - -Run the following: - -gradle -PenvironmentName=local -i runInputMLCP - -Confirm: -- In STAGING (xmi2es-examples-hrdm-STAGING) we now have 2008 or more documents. - -### Load Mapping Spec - -We have an Excel mapping spec document in data/mapping folder. Load it into MarkLogic as follows: - -gradle -b uml2es4dhf.gradle -Pdiscover=true -PspecName=global-mapping uLoadMappingSpec - -Confirm: -- Final DB (xmi2es-examples-hrdm-FINAL) includes the following documents - * /xmi2es/excel-mapper/global-mapping.xlsx (The Global mapping spreadsheet that we composed and loaded into ML) - * /xmi2es/excel-mapper/global-mapping.json (The Global mapping in JSON form) - * /xmi2es/excel-mapper/findings/global-mapping.xml (Problems during the Global load. Confirm there are none.) - * /xmi2es/discovery/global-mapping.json (Discovery!!! While loading, the toolkit searches the staging database to intelligently map source data to the model. So, even if the author of the mapping spec isn't sure how to map a specific - -### Create Harmonization Flows -We now have UML2ES create a DM-based mapping: - -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i uCreateDHFHarmonizeFlow -PmodelName=DHFEmployeeSample -PflowName=harmonizeGlobalDM -PentityName=Employee -PpluginFormat=sjs -PdataFormat=json -PcontentMode=dm -PmappingSpec=/xmi2es/excel-mapper/global-mapping.json - -Confirm: -- Local copy of harmonization is in gradle folder at data/cookieCutter-dump/cookieCutter -- Local copy of DM template is in gradle folder at data/cookieCutter-dump/dm/mapper -- Local plugins/Employee/harmonization/harmonizeGlobalDM has the harmonization. - -### Tweak the Harmonization Flow - -We now tweak the content modules of the generation harmonization. We cooked those beforehand. They are in data/tweaks. We have three tweaks: - -- Changed collector.sjs for the harmonization flow. Change: constrain harmonization job to a specific URI directory from staging. See under data/tweaks/plugins/entities. -- Changed content.sjs for the harmonization flow. Change: Change DM input to be the combination of employee and salary records. See under data/tweaks/plugins/entities. -- Changed the DM template. See under data/tweaks/dm. - -To promote your DM tweaks, run the following: - -gradle -b uml2es4dhf.gradle -PenvironmentName=local -i -PdmPath=data/tweaks uLoadDMTemplate - -To promote you harmonization tweak, run the following: - -gradle -PenvironmentName=local -i tweakHarmonization mlReloadModules - -Confirm: -- The code in plugins/entities/Employee/harmonization has the tweaks. -- Your DM changes are in the xmi2es-examples-hrdm-FINAL database at URI /dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.json. - -### Harmonize -Run harmonization to move employee and department data to FINAL. - -Run the following: - -gradle -PenvironmentName=local -i hubRunFlow -PentityName=Employee -PflowName=harmonizeGlobalDM - -Confirm: -FINAL now contains: - - 1000 documents in Employee collection - - - diff --git a/uml2es/examples/hrdm/build.gradle b/uml2es/examples/hrdm/build.gradle deleted file mode 100644 index 74ec967..0000000 --- a/uml2es/examples/hrdm/build.gradle +++ /dev/null @@ -1,163 +0,0 @@ -buildscript { - repositories { - maven {url 'http://developer.marklogic.com/maven2/'} - } -} - -plugins { - id 'java' - id 'eclipse' - id 'idea' - - // This plugin allows you to create different environments - // for your gradle deploy. Each environment is represented - // by a gradle-${env}.properties file - // See https://github.com/stevesaliman/gradle-properties-plugin - // specify the env on the command line with: - // gradle -PenvironmentName=x ... - id 'net.saliman.properties' version '1.4.6' - - // This gradle plugin extends the ml-gradle plugin with - // commands that make the Data Hub Framework do its magic - id 'com.marklogic.ml-data-hub' version '4.1.0' -} - -repositories { - jcenter() - maven {url 'http://developer.marklogic.com/maven2/'} - - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } - - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } -} - -configurations { - // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want - // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as - // shown below. Need to force to use certain version of xml-apis library. - mlcp { - resolutionStrategy { - force "xml-apis:xml-apis:1.4.01" - } - } -} - -dependencies { - // this allows you to write custom java code that depends - // on the Data Hub Framework library - compile 'com.marklogic:marklogic-data-hub:4.1.0' - compile 'com.marklogic:marklogic-xcc:9.0.7' - - mlcp "com.marklogic:mlcp:9.0.6" - mlcp "org.apache.commons:commons-csv:1.2" - mlcp files("lib") -} - -task loadGlobalEmployee(type: com.marklogic.gradle.task.MlcpTask) { - def dataDir = "${projectDir}"; - def unixDir = dataDir.replace('\\', '/'); - def regexDir = unixDir+"/data/hr/GlobalCorp/employee"; - def regex = '"' + regexDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - host = mlHost - port = mlStagingPort.toInteger() - database = mlStagingDbName - - document_type = "json" - input_file_path = "data/hr/GlobalCorp/employee/EmployeeTable.csv" - input_file_type ="delimited_text" - - output_collections= "Employee,LoadEmployee,input" - output_permissions= "rest-reader,read,rest-writer,update" - output_uri_replace=regex - output_uri_prefix = "/hr/employee/global/" - output_uri_suffix = ".json" - - transform_module="/data-hub/4/transforms/mlcp-flow-transform.sjs" - transform_namespace="http://marklogic.com/data-hub/mlcp-flow-transform" - transform_param "entity-name=Employee,flow-name=LoadEmployee" -} - -task loadGlobalSalary(type: com.marklogic.gradle.task.MlcpTask) { - def dataDir = "${projectDir}"; - def unixDir = dataDir.replace('\\', '/'); - def regexDir = unixDir+"/data/hr/GlobalCorp/employee"; - def regex = '"' + regexDir + ",'',/,''" + '"' - - println regex - - classpath = configurations.mlcp - command = "IMPORT" - host = mlHost - port = mlStagingPort.toInteger() - database = mlStagingDbName - - document_type = "json" - input_file_path = "data/hr/GlobalCorp/employee/SalaryTable.csv" - input_file_type ="delimited_text" - - output_collections= "Salary,LoadEmployee,input" - output_permissions= "rest-reader,read,rest-writer,update" - output_uri_replace=regex - output_uri_prefix = "/hr/salary/global/" - output_uri_suffix = ".json" - - transform_module="/data-hub/4/transforms/mlcp-flow-transform.sjs" - transform_namespace="http://marklogic.com/data-hub/mlcp-flow-transform" - transform_param "entity-name=Employee,flow-name=LoadEmployee" -} - -task runInputMLCP() { - dependsOn 'loadGlobalEmployee' - dependsOn 'loadGlobalSalary' -} - -task includeXMI2ESTransform(type: Copy) { - from "../../uml2esTransform/src/main/ml-modules/root/xmi2es" - into "src/main/ml-modules/root/xmi2es" -} - -task includeUGradle() { - // Don't use Copy task bcuz file locking into gradle project dir on Windows - doLast { - copy { - from "../../uml2esTransform/uml2es4dhf.gradle" - into "." - } - } -} - -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/DHFEmployeeSample.xml" - into "data/model" - filter { it.replaceAll('".xml"', '".json"')} -} - -task includeMapping(type: Copy) { - from new File("${projectDir}").getParentFile().getAbsolutePath() + "/hr/data/mapping/global-mapping.xlsx" - into "data/mapping" -} - -task includeSourceData(type: Copy) { - from new File("${projectDir}").getParentFile().getAbsolutePath() + "/hr/data/hr" - into "data/hr" -} - -task setup() { - dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') - dependsOn('includeMapping') - dependsOn('includeSourceData') - dependsOn('includeUGradle') -} - -task tweakHarmonization(type: Copy) { - from "data/tweaks/plugins/entities/Employee/harmonize/harmonizeGlobalDM/" - into "plugins/entities/Employee/harmonize/harmonizeGlobalDM" -} diff --git a/uml2es/examples/hrdm/data/tweaks/dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.json b/uml2es/examples/hrdm/data/tweaks/dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.json deleted file mode 100644 index 8983527..0000000 --- a/uml2es/examples/hrdm/data/tweaks/dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.json +++ /dev/null @@ -1,579 +0,0 @@ -{ - "description" : { - "Model http://com.marklogic.es.uml.hr/HR-0.0.1 is stereotyped in the model as follows:" : { - "hasFunction" : [ "doCalculation_Department_deptIRI", - "doCalculation_Department_uri", - "doCalculation_Employee_empIRI", - "doCalculation_Employee_empLabel", - "doCalculation_Employee_employeeName", - "doCalculation_Employee_uri", "runWriter_Department", - "runWriter_Employee", "setHeaders_Department", - "setHeaders_Employee", "setTriples_Department", - "setTriples_Employee" ], - "semPrefixes" : [ { - "semPrefix" : [ "org" ], - "semReference" : [ "http://www.w3.org/ns/org#" ] - } ] - }, - "The model also has the specified mapping facts:" : { - "Mapping URI" : "/xmi2es/excel-mapper/global-mapping.json", - "Overall Mapping Source" : "GlobalCorp HR Data", - "Overall Mapping Notes" : "CSV Files Containing Employee, Department, and Salary Data" - }, - "Comments below include discovery findings. See the full report at this URI:" : "/xmi2es/discovery/global-mapping.json", - "Employee" : { - "description" : { - "Class Employee is stereotyped in the model as follows:" : { - "collections" : [ "Employee" ], - "excludes" : [ - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/empIRI", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/empLabel", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/employeeName", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/memberOf", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/reportsTo", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/uri" ], - "semType" : [ "http://xmlns.com/foaf/0.1/Agent" ] - }, - "The class also has the specified mapping facts" : { - "Mapping Source" : [ "EmployeeTable.csv (Primary)", - "SalaryTable.csv (Additional)" ], - "Mapping Notes" : "Notice we map addresses inline. We could also have split them into a separate sheet. Inline makes more sense here. Same for phones and emails.", - "Mapping Collections For Discovery" : null, - "Mapping URI Patterns For Discovery" : null, - "Mapping Sample Data For Discovery" : null - }, - "Discovery found the following:" : { - "Documents whose structure resembles the model" : [ { - "doc" : "/hr/salary/global/195.json", - "numMatches" : 7 - }, { - "doc" : "/hr/salary/global/564.json", - "numMatches" : 7 - }, { - "doc" : "/hr/salary/global/897.json", - "numMatches" : 7 - }, { - "doc" : "/hr/salary/global/821.json", - "numMatches" : 7 - } ], - "Possible collections" : [ "Employee", "LoadEmployee" ], - "Possible URIs" : [ "/hr/employee/global/171.json", - "/hr/employee/global/270.json", - "/hr/employee/global/370.json", - "/hr/employee/global/56.json", - "/hr/employee/global/690.json", - "/hr/employee/global/712.json", - "/hr/employee/global/884.json" ] - } - }, - "attributes" : { - "addresses" : { - "Attribute addresses is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Address" ], - "resolvedType" : [ "#/definitions/Address" ], - "typeIsReference" : [ "true" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "addresses.addressType", - "Source Mapping" : "\"Primary\"", - "Mapping Attribute Notes" : "constant", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.city", - "Source Mapping" : "city", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.country", - "Source Mapping" : "\"USA\"", - "Mapping Attribute Notes" : "constant", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.geoCoordinates.latitute", - "Source Mapping" : "latitude", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.geoCoordinates.longitude", - "Source Mapping" : "longitude", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.lines", - "Source Mapping" : "addr1, addr2", - "Mapping Attribute Notes" : "EmployeeTable, array", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.state", - "Source Mapping" : "states", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.zip", - "Source Mapping" : "zip", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "firstName" : { - "Attribute firstName is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "firstName", - "Source Mapping" : "first_name", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : "Larry", - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/employee/global/137.json", - "physicalName" : "first_name" - }, - { - "document" : "/hr/employee/global/145.json", - "physicalName" : "first_name" - }, - { - "document" : "/hr/employee/global/73.json", - "physicalName" : "first_name" - }, - { - "document" : "/hr/employee/global/614.json", - "physicalName" : "first_name" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "bonus" : { - "Attribute bonus is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "bonus", - "Source Mapping" : "bonus from salary", - "Mapping Attribute Notes" : "SalaryTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/salary/global/47.json", - "physicalName" : "bonus" - }, { - "document" : "/hr/salary/global/635.json", - "physicalName" : "bonus" - }, { - "document" : "/hr/salary/global/295.json", - "physicalName" : "bonus" - }, { - "document" : "/hr/salary/global/354.json", - "physicalName" : "bonus" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "dateOfBirth" : { - "Attribute dateOfBirth is stereotyped in the model as follows:" : { - "resolvedType" : [ "date" ] - } - }, - "effectiveDate" : { - "Attribute effectiveDate is stereotyped in the model as follows:" : { - "resolvedType" : [ "date" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "effectiveDate", - "Source Mapping" : "job_effective_date from salary", - "Mapping Attribute Notes" : "SalaryTable, date format", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "emails" : { - "Attribute emails is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Email" ], - "resolvedType" : [ "#/definitions/Email" ], - "typeIsReference" : [ "true" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "emails.emailAddress", - "Source Mapping" : "home_email, work_email", - "Mapping Attribute Notes" : "EmployeeTable, 2", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "title" : { - "Attribute title is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "title", - "Source Mapping" : "job_title", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "status" : { - "Attribute status is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "status", - "Source Mapping" : "status from salary", - "Mapping Attribute Notes" : "SalaryTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/salary/global/363.json", - "physicalName" : "status" - }, { - "document" : "/hr/salary/global/915.json", - "physicalName" : "status" - }, { - "document" : "/hr/salary/global/994.json", - "physicalName" : "status" - }, { - "document" : "/hr/salary/global/444.json", - "physicalName" : "status" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "employeeId" : { - "Attribute employeeId is stereotyped in the model as follows:" : { - "header" : [ "entityId" ], - "resolvedType" : [ "int" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "employeeId", - "Source Mapping" : "emp_id", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "baseSalary" : { - "Attribute baseSalary is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "baseSalary", - "Source Mapping" : "base_salary from salary", - "Mapping Attribute Notes" : "SalaryTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/salary/global/47.json", - "physicalName" : "base_salary" - }, { - "document" : "/hr/salary/global/363.json", - "physicalName" : "base_salary" - }, { - "document" : "/hr/salary/global/588.json", - "physicalName" : "base_salary" - }, { - "document" : "/hr/salary/global/897.json", - "physicalName" : "base_salary" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "hireDate" : { - "Attribute hireDate is stereotyped in the model as follows:" : { - "resolvedType" : [ "date" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "hireDate", - "Source Mapping" : "hire_date", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/employee/global/394.json", - "physicalName" : "hire_date" - }, - { - "document" : "/hr/employee/global/53.json", - "physicalName" : "hire_date" - }, - { - "document" : "/hr/employee/global/113.json", - "physicalName" : "hire_date" - }, - { - "document" : "/hr/employee/global/323.json", - "physicalName" : "hire_date" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "lastName" : { - "Attribute lastName is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "lastName", - "Source Mapping" : "last_name", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : "Fields", - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/employee/global/133.json", - "physicalName" : "last_name" - }, - { - "document" : "/hr/employee/global/313.json", - "physicalName" : "last_name" - }, - { - "document" : "/hr/employee/global/966.json", - "physicalName" : "last_name" - }, - { - "document" : "/hr/employee/global/642.json", - "physicalName" : "last_name" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "officeNumber" : { - "Attribute officeNumber is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Address" ], - "resolvedType" : [ "#/definitions/Address" ], - "typeIsReference" : [ "true" ] - } - }, - "phones" : { - "Attribute phones is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Phone" ], - "resolvedType" : [ "#/definitions/Phone" ], - "typeIsReference" : [ "true" ] - }, - "The attribute also has the specified mapping facts:" : [ - { - "Model Path" : "phones.phoneType", - "Source Mapping" : "\"home\", \"mobile\", \"pager\" ,\"work\"", - "Mapping Attribute Notes" : "constant, 4", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, - { - "Model Path" : "phones.phoneValue", - "Source Mapping" : "home_phone, mobile, pager, work_phone", - "Mapping Attribute Notes" : "EmployeeTable, 4", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - } - } - }, - "Address" : { - "description" : { - "Class Address is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "addressType" : { - "Attribute addressType is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "city" : { - "Attribute city is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "country" : { - "Attribute country is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "geoCoordinates" : { - "Attribute geoCoordinates is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/GeoCoordinates" ], - "resolvedType" : [ "#/definitions/GeoCoordinates" ], - "typeIsReference" : [ "true" ] - } - }, - "lines" : { - "Attribute lines is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "state" : { - "Attribute state is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "zip" : { - "Attribute zip is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - } - } - }, - "GeoCoordinates" : { - "description" : { - "Class GeoCoordinates is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "latitude" : { - "Attribute latitude is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - } - }, - "longitude" : { - "Attribute longitude is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - } - } - } - }, - "Email" : { - "description" : { - "Class Email is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "emailAddress" : { - "Attribute emailAddress is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "emailType" : { - "Attribute emailType is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - } - } - }, - "Phone" : { - "description" : { - "Class Phone is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "phoneNumber" : { - "Attribute phoneNumber is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "phoneType" : { - "Attribute phoneType is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - } - } - } - }, - "modules" : { - "functionLibraries" : [ "/xmi2es/dm.sjs" ] - }, - "input" : { - "format" : "json" - }, - "variables" : { - "firstName" : "extract('//first_name')", - "lastName" : "extract('//last_name')", - "employeeName" : "xcalc('DHFEmployeeSample', 'Employee', 'employeeName', 'options' , 'firstName', $firstName, 'content' , 'lastName', $lastName, 'content' )", - "empLabel" : "xcalc('DHFEmployeeSample', 'Employee', 'empLabel', 'options' , 'employeeName', $employeeName, 'options' )", - "employeeId" : "extract('//employeeRecord//emp_id')", - "empIRI" : "xcalc('DHFEmployeeSample', 'Employee', 'empIRI', 'options' , 'employeeId', $employeeId, 'content' )", - "uri" : "xcalc('DHFEmployeeSample', 'Employee', 'uri', 'options' , 'employeeId', $employeeId, 'content' )" - }, - "outputs" : { - "main" : { - "format" : "json", - "content" : [ { - "addresses" : [ { - "addressType" : "Primary", - "city" : "[[ extract('//city') ]]", - "country" : "USA", - "geoCoordinates" : { - "latitude" : "[[ extract('//latitude') ]]", - "longitude" : "[[ extract('//longitude') ]]" - }, - "lines" : [ - "[[ extract('//addr1') ]]", - "[[ extract('//addr2') ]]" - ], - "state" : "[[ extract('//state') ]]", - "zip" : "[[ extract('//zip') ]]" - } ], - "firstName" : "[[ $firstName ]]", - "bonus" : "[[ extract('//bonus') ]]", - "dateOfBirth" : "[[ extract('//dob') ]]", - "effectiveDate" : "[[ extract('//job_effective_date') ]]", - "emails" : [ "%%[[ extract('//LOOPCOUNTER') ]]", { - "emailAddress" : "[[ extract('//TODO') ]]", - "emailType" : "[[ extract('//TODO') ]]" - } ], - "title" : "[[ extract('//job_title') ]]", - "status" : "[[ extract('//status') ]]", - "employeeId" : "[[ $employeeId ]]", - "baseSalary" : "[[ extract('//base_salary') ]]", - "hireDate" : "[[ extract('//hire_date') ]]", - "lastName" : "[[ $lastName ]]", - "phones" : [ "%%[[ extract('//LOOPCOUNTER') ]]", { - "phoneNumber" : "[[ extract('//TODO') ]]", - "phoneType" : "[[ extract('//TODO') ]]" - } ] - }, { - "employeeName" : "[[ $employeeName ]]", - "empLabel" : "[[ $empLabel ]]", - "empIRI" : "[[ $empIRI ]]", - "uri" : "[[ $uri ]]", - - "reportsTo": "http://www.w3.org/ns/org#e[[extract('//reports_to')]]", - "memberOf": "http://www.w3.org/ns/org#d[[extract('//dept_num')]]" - } ] - } - } -} diff --git a/uml2es/examples/hrdm/data/tweaks/dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.orig b/uml2es/examples/hrdm/data/tweaks/dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.orig deleted file mode 100644 index 8310866..0000000 --- a/uml2es/examples/hrdm/data/tweaks/dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.orig +++ /dev/null @@ -1,573 +0,0 @@ -{ - "description" : { - "Model http://com.marklogic.es.uml.hr/HR-0.0.1 is stereotyped in the model as follows:" : { - "hasFunction" : [ "doCalculation_Department_deptIRI", - "doCalculation_Department_uri", - "doCalculation_Employee_empIRI", - "doCalculation_Employee_empLabel", - "doCalculation_Employee_employeeName", - "doCalculation_Employee_uri", "runWriter_Department", - "runWriter_Employee", "setHeaders_Department", - "setHeaders_Employee", "setTriples_Department", - "setTriples_Employee" ], - "semPrefixes" : [ { - "semPrefix" : [ "org" ], - "semReference" : [ "http://www.w3.org/ns/org#" ] - } ] - }, - "The model also has the specified mapping facts:" : { - "Mapping URI" : "/xmi2es/excel-mapper/global-mapping.json", - "Overall Mapping Source" : "GlobalCorp HR Data", - "Overall Mapping Notes" : "CSV Files Containing Employee, Department, and Salary Data" - }, - "Comments below include discovery findings. See the full report at this URI:" : "/xmi2es/discovery/global-mapping.json", - "Employee" : { - "description" : { - "Class Employee is stereotyped in the model as follows:" : { - "collections" : [ "Employee" ], - "excludes" : [ - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/empIRI", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/empLabel", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/employeeName", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/memberOf", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/reportsTo", - "http://com.marklogic.es.uml.hr/HR-0.0.1/Employee/uri" ], - "semType" : [ "http://xmlns.com/foaf/0.1/Agent" ] - }, - "The class also has the specified mapping facts" : { - "Mapping Source" : [ "EmployeeTable.csv (Primary)", - "SalaryTable.csv (Additional)" ], - "Mapping Notes" : "Notice we map addresses inline. We could also have split them into a separate sheet. Inline makes more sense here. Same for phones and emails.", - "Mapping Collections For Discovery" : null, - "Mapping URI Patterns For Discovery" : null, - "Mapping Sample Data For Discovery" : null - }, - "Discovery found the following:" : { - "Documents whose structure resembles the model" : [ { - "doc" : "/hr/salary/global/195.json", - "numMatches" : 7 - }, { - "doc" : "/hr/salary/global/564.json", - "numMatches" : 7 - }, { - "doc" : "/hr/salary/global/897.json", - "numMatches" : 7 - }, { - "doc" : "/hr/salary/global/821.json", - "numMatches" : 7 - } ], - "Possible collections" : [ "Employee", "LoadEmployee" ], - "Possible URIs" : [ "/hr/employee/global/171.json", - "/hr/employee/global/270.json", - "/hr/employee/global/370.json", - "/hr/employee/global/56.json", - "/hr/employee/global/690.json", - "/hr/employee/global/712.json", - "/hr/employee/global/884.json" ] - } - }, - "attributes" : { - "addresses" : { - "Attribute addresses is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Address" ], - "resolvedType" : [ "#/definitions/Address" ], - "typeIsReference" : [ "true" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "addresses.addressType", - "Source Mapping" : "\"Primary\"", - "Mapping Attribute Notes" : "constant", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.city", - "Source Mapping" : "city", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.country", - "Source Mapping" : "\"USA\"", - "Mapping Attribute Notes" : "constant", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.geoCoordinates.latitute", - "Source Mapping" : "latitude", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.geoCoordinates.longitude", - "Source Mapping" : "longitude", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.lines", - "Source Mapping" : "addr1, addr2", - "Mapping Attribute Notes" : "EmployeeTable, array", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.state", - "Source Mapping" : "states", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, { - "Model Path" : "addresses.zip", - "Source Mapping" : "zip", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "firstName" : { - "Attribute firstName is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "firstName", - "Source Mapping" : "first_name", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : "Larry", - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/employee/global/137.json", - "physicalName" : "first_name" - }, - { - "document" : "/hr/employee/global/145.json", - "physicalName" : "first_name" - }, - { - "document" : "/hr/employee/global/73.json", - "physicalName" : "first_name" - }, - { - "document" : "/hr/employee/global/614.json", - "physicalName" : "first_name" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "bonus" : { - "Attribute bonus is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "bonus", - "Source Mapping" : "bonus from salary", - "Mapping Attribute Notes" : "SalaryTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/salary/global/47.json", - "physicalName" : "bonus" - }, { - "document" : "/hr/salary/global/635.json", - "physicalName" : "bonus" - }, { - "document" : "/hr/salary/global/295.json", - "physicalName" : "bonus" - }, { - "document" : "/hr/salary/global/354.json", - "physicalName" : "bonus" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "dateOfBirth" : { - "Attribute dateOfBirth is stereotyped in the model as follows:" : { - "resolvedType" : [ "date" ] - } - }, - "effectiveDate" : { - "Attribute effectiveDate is stereotyped in the model as follows:" : { - "resolvedType" : [ "date" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "effectiveDate", - "Source Mapping" : "job_effective_date from salary", - "Mapping Attribute Notes" : "SalaryTable, date format", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "emails" : { - "Attribute emails is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Email" ], - "resolvedType" : [ "#/definitions/Email" ], - "typeIsReference" : [ "true" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "emails.emailAddress", - "Source Mapping" : "home_email, work_email", - "Mapping Attribute Notes" : "EmployeeTable, 2", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "title" : { - "Attribute title is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "title", - "Source Mapping" : "job_title", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "status" : { - "Attribute status is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "status", - "Source Mapping" : "status from salary", - "Mapping Attribute Notes" : "SalaryTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/salary/global/363.json", - "physicalName" : "status" - }, { - "document" : "/hr/salary/global/915.json", - "physicalName" : "status" - }, { - "document" : "/hr/salary/global/994.json", - "physicalName" : "status" - }, { - "document" : "/hr/salary/global/444.json", - "physicalName" : "status" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "employeeId" : { - "Attribute employeeId is stereotyped in the model as follows:" : { - "header" : [ "entityId" ], - "resolvedType" : [ "int" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "employeeId", - "Source Mapping" : "emp_id", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - }, - "baseSalary" : { - "Attribute baseSalary is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "baseSalary", - "Source Mapping" : "base_salary from salary", - "Mapping Attribute Notes" : "SalaryTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/salary/global/47.json", - "physicalName" : "base_salary" - }, { - "document" : "/hr/salary/global/363.json", - "physicalName" : "base_salary" - }, { - "document" : "/hr/salary/global/588.json", - "physicalName" : "base_salary" - }, { - "document" : "/hr/salary/global/897.json", - "physicalName" : "base_salary" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "hireDate" : { - "Attribute hireDate is stereotyped in the model as follows:" : { - "resolvedType" : [ "date" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "hireDate", - "Source Mapping" : "hire_date", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/employee/global/394.json", - "physicalName" : "hire_date" - }, - { - "document" : "/hr/employee/global/53.json", - "physicalName" : "hire_date" - }, - { - "document" : "/hr/employee/global/113.json", - "physicalName" : "hire_date" - }, - { - "document" : "/hr/employee/global/323.json", - "physicalName" : "hire_date" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "lastName" : { - "Attribute lastName is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - }, - "The attribute also has the specified mapping facts:" : [ { - "Model Path" : "lastName", - "Source Mapping" : "last_name", - "Mapping Attribute Notes" : "EmployeeTable", - "Mapping Attribute Sample Data For Discovery" : "Fields", - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [ - { - "document" : "/hr/employee/global/133.json", - "physicalName" : "last_name" - }, - { - "document" : "/hr/employee/global/313.json", - "physicalName" : "last_name" - }, - { - "document" : "/hr/employee/global/966.json", - "physicalName" : "last_name" - }, - { - "document" : "/hr/employee/global/642.json", - "physicalName" : "last_name" - } ], - "Similar to physical predicate in candidate document" : [] - } - }, - "officeNumber" : { - "Attribute officeNumber is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Address" ], - "resolvedType" : [ "#/definitions/Address" ], - "typeIsReference" : [ "true" ] - } - }, - "phones" : { - "Attribute phones is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/Phone" ], - "resolvedType" : [ "#/definitions/Phone" ], - "typeIsReference" : [ "true" ] - }, - "The attribute also has the specified mapping facts:" : [ - { - "Model Path" : "phones.phoneType", - "Source Mapping" : "\"home\", \"mobile\", \"pager\" ,\"work\"", - "Mapping Attribute Notes" : "constant, 4", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - }, - { - "Model Path" : "phones.phoneValue", - "Source Mapping" : "home_phone, mobile, pager, work_phone", - "Mapping Attribute Notes" : "EmployeeTable, 4", - "Mapping Attribute Sample Data For Discovery" : null, - "Mapping Attribute AKA For Discovery" : null - } ], - "Discovery found the following:" : { - "Similar to physical attribute in candidate document" : [], - "Similar to physical predicate in candidate document" : [] - } - } - } - }, - "Address" : { - "description" : { - "Class Address is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "addressType" : { - "Attribute addressType is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "city" : { - "Attribute city is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "country" : { - "Attribute country is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "geoCoordinates" : { - "Attribute geoCoordinates is stereotyped in the model as follows:" : { - "reference" : [ "http://com.marklogic.es.uml.hr/HR-0.0.1/GeoCoordinates" ], - "resolvedType" : [ "#/definitions/GeoCoordinates" ], - "typeIsReference" : [ "true" ] - } - }, - "lines" : { - "Attribute lines is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "state" : { - "Attribute state is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "zip" : { - "Attribute zip is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - } - } - }, - "GeoCoordinates" : { - "description" : { - "Class GeoCoordinates is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "latitude" : { - "Attribute latitude is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - } - }, - "longitude" : { - "Attribute longitude is stereotyped in the model as follows:" : { - "resolvedType" : [ "float" ] - } - } - } - }, - "Email" : { - "description" : { - "Class Email is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "emailAddress" : { - "Attribute emailAddress is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "emailType" : { - "Attribute emailType is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - } - } - }, - "Phone" : { - "description" : { - "Class Phone is stereotyped in the model as follows:" : {} - }, - "attributes" : { - "phoneNumber" : { - "Attribute phoneNumber is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - }, - "phoneType" : { - "Attribute phoneType is stereotyped in the model as follows:" : { - "resolvedType" : [ "string" ] - } - } - } - } - }, - "modules" : { - "functionLibraries" : [ "/xmi2es/dm.sjs" ] - }, - "input" : { - "format" : "json" - }, - "variables" : { - "firstName" : "extract('//TODO')", - "lastName" : "extract('//TODO')", - "employeeName" : "xcalc('DHFEmployeeSample', 'Employee', 'employeeName', 'options' , 'firstName', $firstName, 'content' , 'lastName', $lastName, 'content' )", - "empLabel" : "xcalc('DHFEmployeeSample', 'Employee', 'empLabel', 'options' , 'employeeName', $employeeName, 'options' )", - "employeeId" : "extract('//TODO')", - "empIRI" : "xcalc('DHFEmployeeSample', 'Employee', 'empIRI', 'options' , 'employeeId', $employeeId, 'content' )", - "uri" : "xcalc('DHFEmployeeSample', 'Employee', 'uri', 'options' , 'employeeId', $employeeId, 'content' )" - }, - "outputs" : { - "main" : { - "format" : "json", - "content" : [ { - "addresses" : [ "%%[[ extract('//LOOPCOUNTER') ]]", { - "addressType" : "[[ extract('//TODO') ]]", - "city" : "[[ extract('//TODO') ]]", - "country" : "[[ extract('//TODO') ]]", - "geoCoordinates" : { - "latitude" : "[[ extract('//TODO') ]]", - "longitude" : "[[ extract('//TODO') ]]" - }, - "lines" : "[[ extract('//TODO') ]]", - "state" : "[[ extract('//TODO') ]]", - "zip" : "[[ extract('//TODO') ]]" - } ], - "firstName" : "[[ $firstName ]]", - "bonus" : "[[ extract('//TODO') ]]", - "dateOfBirth" : "[[ extract('//TODO') ]]", - "effectiveDate" : "[[ extract('//TODO') ]]", - "emails" : [ "%%[[ extract('//LOOPCOUNTER') ]]", { - "emailAddress" : "[[ extract('//TODO') ]]", - "emailType" : "[[ extract('//TODO') ]]" - } ], - "title" : "[[ extract('//TODO') ]]", - "status" : "[[ extract('//TODO') ]]", - "employeeId" : "[[ $employeeId ]]", - "baseSalary" : "[[ extract('//TODO') ]]", - "hireDate" : "[[ extract('//TODO') ]]", - "lastName" : "[[ $lastName ]]", - "phones" : [ "%%[[ extract('//LOOPCOUNTER') ]]", { - "phoneNumber" : "[[ extract('//TODO') ]]", - "phoneType" : "[[ extract('//TODO') ]]" - } ] - }, { - "employeeName" : "[[ $employeeName ]]", - "empLabel" : "[[ $empLabel ]]", - "empIRI" : "[[ $empIRI ]]", - "uri" : "[[ $uri ]]" - } ] - } - } -} diff --git a/uml2es/examples/hrdm/data/tweaks/plugins/entities/Employee/harmonize/harmonizeGlobalDM/collector.sjs b/uml2es/examples/hrdm/data/tweaks/plugins/entities/Employee/harmonize/harmonizeGlobalDM/collector.sjs deleted file mode 100644 index 340b24f..0000000 --- a/uml2es/examples/hrdm/data/tweaks/plugins/entities/Employee/harmonize/harmonizeGlobalDM/collector.sjs +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Collect IDs plugin - * - * @param options - a map containing options. Options are sent from Java - * - * @return - an array of ids or uris - */ -function collect(options) { - // by default we return the URIs in the same collection as the Entity name - return cts.uris(null, null, cts.directoryQuery("/hr/employee/global/")); -} - -module.exports = { - collect: collect -}; diff --git a/uml2es/examples/hrdm/data/tweaks/plugins/entities/Employee/harmonize/harmonizeGlobalDM/content.sjs b/uml2es/examples/hrdm/data/tweaks/plugins/entities/Employee/harmonize/harmonizeGlobalDM/content.sjs deleted file mode 100644 index 8e3e114..0000000 --- a/uml2es/examples/hrdm/data/tweaks/plugins/entities/Employee/harmonize/harmonizeGlobalDM/content.sjs +++ /dev/null @@ -1,77 +0,0 @@ -/* -Experimental UML2ES/DM Code. Inspect and tweak DM template /dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.json -*/ - -'use strict' - -const xesgen = require("/modelgen/DHFEmployeeSample/lib.sjs"); -const util = require("/xmi2es/util.sjs"); - - -const dhfConfig = require("/com.marklogic.hub/config.sjs"); -const dm = require('/ext/declarative-mapper.sjs'); -const DM_MAPPING_CONFIG_URI = "/dm/mapper/DHFEmployeeSample/Employee/harmonizeGlobalDM.json"; -function getDMMapper(options) { - if (!options.mapper) { - var dmTemplate = xdmp.eval('cts.doc(uri)', {uri: DM_MAPPING_CONFIG_URI}, {database: xdmp.database( - dhfConfig.FINALDATABASE)}).toArray()[0].toObject(); - var ctx = dm.newCompilerContext(dmTemplate); - var mapper = dm.prepare(ctx); - options.mapper = mapper; - } - return options.mapper; -} - - -/* -* Create Content Plugin -* -* @param id - the identifier returned by the collector -* @param options - an object containing options. Options are sent from Java -* -* @return - your content -*/ -function createContent(id, options) { - let doc = cts.doc(id); - let ioptions = util.setIOptions(id,options); - - let source; - - // for xml we need to use xpath - if(doc && xdmp.nodeKind(doc) === 'element' && doc instanceof XMLDocument) { - source = doc - } - // for json we need to return the instance - else if(doc && doc instanceof Document) { - source = fn.head(doc.root); - } - // for everything else - else { - source = doc; - } - - return buildContent_Employee(id, source, options, ioptions); -} - -function buildContent_Employee(id, source, options, ioptions) { - var mapper = getDMMapper(options); - - var salaryURI = fn.replace(id, "/employee/", "/salary/"); - var globalSource = { - employeeRecord: source, - salaryRecord: cts.doc(salaryURI).toObject() - }; - - var mapping = mapper(globalSource); - var doptions = mapping[1]; - for (var dopt in doptions) { - ioptions[dopt] = doptions[dopt]; - } - xdmp.log("Options for " + id + " are " + JSON.stringify(ioptions)); - return mapping[0]; -} - - -module.exports = { - createContent: createContent -}; diff --git a/uml2es/examples/hrdm/gradle.properties b/uml2es/examples/hrdm/gradle.properties deleted file mode 100644 index 32fad95..0000000 --- a/uml2es/examples/hrdm/gradle.properties +++ /dev/null @@ -1,71 +0,0 @@ -mlDHFVersion=4.1.0 -mlHost=localhost -mlUsername=admin -mlPassword=admin - -mlStagingAppserverName=xmi2es-examples-hrdm-STAGING -mlStagingPort=13304 -mlStagingDbName=xmi2es-examples-hrdm-STAGING -mlStagingForestsPerHost=3 -mlStagingAuth=digest -# To enable SSL for staging -# mlStagingSimpleSsl=true - -mlFinalAppserverName=xmi2es-examples-hrdm-FINAL -mlFinalPort=13305 -mlFinalDbName=xmi2es-examples-hrdm-FINAL -mlFinalForestsPerHost=3 -mlFinalAuth=digest -# To enable SSL for final -# mlFinalSimpleSsl=true - -mlJobAppserverName=xmi2es-examples-hrdm-JOBS -mlJobPort=13306 -mlJobDbName=xmi2es-examples-hrdm-JOBS -mlJobForestsPerHost=4 -mlJobAuth=digest -# To enable SSL for jobs -# mlJobSimpleSsl=true - -mlModulesDbName=xmi2es-examples-hrdm-MODULES -mlModulesForestsPerHost=1 - -mlStagingTriggersDbName=xmi2es-examples-hrdm-staging-TRIGGERS -mlStagingTriggersForestsPerHost=1 - -mlStagingSchemasDbName=xmi2es-examples-hrdm-staging-SCHEMAS -mlStagingSchemasForestsPerHost=1 - -mlFinalTriggersDbName=xmi2es-examples-hrdm-final-TRIGGERS -mlFinalTriggersForestsPerHost=1 - -mlFinalSchemasDbName=xmi2es-examples-hrdm-final-SCHEMAS -mlFinalSchemasForestsPerHost=1 - -# You can override this to specify an alternate folder for your -# custom forest info. Defaults to user-config/forests/ -# mlCustomForestPath=forests - -# The name of the Role to create for Hub Access -mlHubUserRole=data-hub-role -mlHubUserName=data-hub-user -# this password is autogenerated for you via the 'gradle hubInit' task -mlHubUserPassword=g?E)I^h67^hH{QqN2jY[ - -# The name of the role to create for hub deployment/development -mlHubAdminRole=hub-admin-role -mlHubAdminUserName=hub-admin-user -mlHubAdminUserPassword=?t4K$z-W5gjb@PI31(wj - -# Deprecated property -# If you are working with a load balancer please indicate so using -# property "mlIsHostLoadBalancer" -# When "mlIsHostLoadBalancer" is set to "true", the value specified for "mlHost" will be used as the load balancer. -# You do not need to explicitly set the value of "mlLoadBalancerHosts" but if you do it must match the value of the property "mlHost" -# mlLoadBalancerHosts=your-load-balancer-hostname - -# Default module permissions which allow data-hub-role to execute flows -mlModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,data-hub-role,read,data-hub-role,execute - -# If DHF is running in a provisioned environment please specify it here -# mlIsProvisionedEnvironment=false diff --git a/uml2es/examples/hrdm/lib/log4j.properties b/uml2es/examples/hrdm/lib/log4j.properties deleted file mode 100644 index e7e9930..0000000 --- a/uml2es/examples/hrdm/lib/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -#root logger option -log4j.rootLogger=INFO, stdout - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n - diff --git a/uml2es/examples/hrdm/src/main/entity-config/final-entity-options.xml b/uml2es/examples/hrdm/src/main/entity-config/final-entity-options.xml deleted file mode 100644 index a0abc89..0000000 --- a/uml2es/examples/hrdm/src/main/entity-config/final-entity-options.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - unfiltered - - - //*:instance/(Department|Employee) - - - - true - - - \ No newline at end of file diff --git a/uml2es/examples/hrdm/src/main/entity-config/staging-entity-options.xml b/uml2es/examples/hrdm/src/main/entity-config/staging-entity-options.xml deleted file mode 100644 index a0abc89..0000000 --- a/uml2es/examples/hrdm/src/main/entity-config/staging-entity-options.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - unfiltered - - - //*:instance/(Department|Employee) - - - - true - - - \ No newline at end of file diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/users/data-hub-user.json b/uml2es/examples/hrdm/src/main/hub-internal-config/security/users/data-hub-user.json deleted file mode 100644 index 51ded85..0000000 --- a/uml2es/examples/hrdm/src/main/hub-internal-config/security/users/data-hub-user.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "user-name": "%%mlHubUserName%%", - "description": "A user that is used for reading and writing from MarkLogic Data Hub databases", - "password": "%%mlHubUserPassword%%", - "role": ["%%mlHubUserRole%%"] -} diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/users/hub-admin-user.json b/uml2es/examples/hrdm/src/main/hub-internal-config/security/users/hub-admin-user.json deleted file mode 100644 index 6dfc31f..0000000 --- a/uml2es/examples/hrdm/src/main/hub-internal-config/security/users/hub-admin-user.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "user-name": "%%mlHubAdminUserName%%", - "description": "A user that is used for reading and writing from MarkLogic Data Hub databases and for maintaining DHF modules", - "password": "%%mlHubAdminUserPassword%%", - "role": ["%%mlHubAdminRole%%","%%mlHubUserRole%%"] -} diff --git a/uml2es/examples/hrexcel/README.md b/uml2es/examples/hrexcel/README.md index 817f30c..b024178 100644 --- a/uml2es/examples/hrexcel/README.md +++ b/uml2es/examples/hrexcel/README.md @@ -37,7 +37,7 @@ Setup new DB. Will use basic DB config with no indexes. Will bring in XMI2ES tra Run the following: -gradle -PenvironmentName=local -i setup mlDeploy +./gradlew -i setup mlDeploy Confirm: - New DB and app server created with name xmi2es-examples-hrexcel. @@ -46,11 +46,11 @@ Confirm: Run the following to load the Excel HR model: -gradle -b uml2es.gradle -PenvironmentName=local -PmodelName=HRExcel -i uDeployModel +./gradlew -b uml2es.gradle -i -PmodelFile=data/model-excel/HRExcel.xlsx uDeployModel Confirm: - Content DB includes several documents created when loading the Excel, including: - * /marklogic.com/entity-services/models/HRExcel.json - the ES model from the Excel + * /xm12es/es/HRExcel.json - the ES model from the Excel * /xmi2es/extension/HRExcel.ttl - the extended ES model from the Excel * /xmi2es/findings/HRExcel.xml - findings during the transform of the Excel * /xmi2es/excel/HRExcel.xlsx - Original Excel file @@ -62,11 +62,11 @@ Check the /xmi2es/findings/HRExcel.xml file. This indicates whether there were a For comparison, we will load the HR UML model from examples/hr. Run the following: -gradle -b uml2es.gradle -PenvironmentName=local -PmodelName=DHFEmployeeSample -i uDeployModel +./gradlew -b uml2es.gradle -PmodelFile=../umlModels/DHFEmployeeSample.xml -i uDeployModel Confirm: - Content DB now has, in addition to the documents created in the previous step, the following documents - * /marklogic.com/entity-services/models/DHFEmployeeSample.json - the ES model from the UML + * /xmi2es/es/DHFEmployeeSample.json - the ES model from the UML * /xmi2es/extension/DHFEmployeeSample.ttl - the extended ES model from the UML * /xmi2es/findings/DHFEmployeeSample.xml - findings during the transform of the UML. * /xmi2es/xmi/DHFEmployeeSample.xml - the original UML model in XMI form. diff --git a/uml2es/examples/hrexcel/build.gradle b/uml2es/examples/hrexcel/build.gradle index d378588..4863934 100644 --- a/uml2es/examples/hrexcel/build.gradle +++ b/uml2es/examples/hrexcel/build.gradle @@ -1,12 +1,13 @@ + buildscript { repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} mavenLocal() - maven { url "http://plugins.gradle.org/m2" } + maven { url "https://plugins.gradle.org/m2" } } dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" + classpath "com.marklogic:ml-gradle:4.0.1" classpath "net.saliman:gradle-properties-plugin:1.4.6" } } @@ -15,14 +16,14 @@ apply plugin: "net.saliman.properties" apply plugin: "com.marklogic.ml-gradle" repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } + maven { url "https://plugins.gradle.org/m2" } + maven { url "https://developer.marklogic.com/maven2/" } // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } + maven { url "https://repository.cloudera.com/artifactory/cloudera-repos/" } } configurations { @@ -37,7 +38,7 @@ configurations { } dependencies { - mlcp "com.marklogic:mlcp:9.0.6" + mlcp "com.marklogic:mlcp:9.0.10" mlcp "org.apache.commons:commons-csv:1.2" mlcp files("lib") } @@ -48,12 +49,6 @@ task includeXMI2ESTransform(type: Copy) { into "src/main/ml-modules/root/xmi2es" } -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/DHFEmployeeSample.xml" - into "data/model" -} - task includeUGradle() { // Don't use Copy task bcuz file locking into gradle project dir on Windows doLast { @@ -66,7 +61,6 @@ task includeUGradle() { task setup() { dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') dependsOn('includeUGradle') } diff --git a/uml2es/examples/hrexcel/gradle/wrapper/gradle-wrapper.jar b/uml2es/examples/hrexcel/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c Binary files /dev/null and b/uml2es/examples/hrexcel/gradle/wrapper/gradle-wrapper.jar differ diff --git a/uml2es/examples/hrexcel/gradle/wrapper/gradle-wrapper.properties b/uml2es/examples/hrexcel/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..44e7c4d --- /dev/null +++ b/uml2es/examples/hrexcel/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/uml2es/examples/hrexcel/gradlew b/uml2es/examples/hrexcel/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/uml2es/examples/hrexcel/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/uml2es/examples/jokeBook/README.md b/uml2es/examples/jokeBook/README.md index 5922bfe..f250470 100644 --- a/uml2es/examples/jokeBook/README.md +++ b/uml2es/examples/jokeBook/README.md @@ -22,7 +22,7 @@ Setup new DB. Will use basic DB config with no indexes. Will bring in XMI2ES tra Run the following: -gradle -PenvironmentName=local -i setup mlDeploy +./gradlew -i setup mlDeploy Confirm: - New DB and app server created with name xmi2es-examples-jokebook. @@ -33,7 +33,7 @@ Confirm: ### Transform UML to ES Next, move our UML model into ML as an ES model. Run the following: -gradle -b uml2es.gradle -PenvironmentName=local -i -PmodelName=JokeBook uDeployModel +./gradlew -b uml2es.gradle -i -PmodelFile=../umlModels/JokeBook.xml uDeployModel Confirm: - Content DB has the following documents @@ -57,7 +57,7 @@ Among the results, you should see the following: ### Deploy the Generated Code The generated code needs to be deployed. Run the following: -gradle -PenvironmentName=local -i mlReloadModules +./gradlew -i mlReloadModules ## Explore In Query Console, import XMI2ESJokeBook.xml workspace. You won't want to miss this part; it's where the fun happens: you create documents whose embedded triples conform to the model! diff --git a/uml2es/examples/jokeBook/build.gradle b/uml2es/examples/jokeBook/build.gradle index c2bd5a1..d2a3160 100644 --- a/uml2es/examples/jokeBook/build.gradle +++ b/uml2es/examples/jokeBook/build.gradle @@ -1,28 +1,29 @@ + buildscript { - repositories { - jcenter{url "http://jcenter.bintray.com/"} - mavenLocal() - maven { url "http://plugins.gradle.org/m2" } - } - dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" - classpath "net.saliman:gradle-properties-plugin:1.4.6" - } + repositories { + jcenter{url "https://jcenter.bintray.com/"} + mavenLocal() + maven { url "https://plugins.gradle.org/m2" } + } + dependencies { + classpath "com.marklogic:ml-gradle:4.0.1" + classpath "net.saliman:gradle-properties-plugin:1.4.6" + } } apply plugin: "net.saliman.properties" apply plugin: "com.marklogic.ml-gradle" repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } + // Needed for mlcp dependencies + maven { url "https://plugins.gradle.org/m2" } + maven { url "https://developer.marklogic.com/maven2/" } - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } + // Needed for hadoop dependencies for mlcp + maven { url "https://repository.cloudera.com/artifactory/cloudera-repos/" } } configurations { @@ -37,7 +38,7 @@ configurations { } dependencies { - mlcp "com.marklogic:mlcp:9.0.6" + mlcp "com.marklogic:mlcp:9.0.10" mlcp "org.apache.commons:commons-csv:1.2" mlcp files("lib") } @@ -47,12 +48,6 @@ task includeXMI2ESTransform(type: Copy) { into "src/main/ml-modules/root/xmi2es" } -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/JokeBook.xml" - into "data/model" -} - task includeUGradle() { // Don't use Copy task bcuz file locking into gradle project dir on Windows doLast { @@ -65,7 +60,6 @@ task includeUGradle() { task setup() { dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') dependsOn('includeUGradle') } diff --git a/uml2es/examples/jokeBook/gradle/wrapper/gradle-wrapper.jar b/uml2es/examples/jokeBook/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c Binary files /dev/null and b/uml2es/examples/jokeBook/gradle/wrapper/gradle-wrapper.jar differ diff --git a/uml2es/examples/jokeBook/gradle/wrapper/gradle-wrapper.properties b/uml2es/examples/jokeBook/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..44e7c4d --- /dev/null +++ b/uml2es/examples/jokeBook/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/uml2es/examples/jokeBook/gradlew b/uml2es/examples/jokeBook/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/uml2es/examples/jokeBook/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/uml2es/examples/movies/README.md b/uml2es/examples/movies/README.md index f7ca065..16bffde 100644 --- a/uml2es/examples/movies/README.md +++ b/uml2es/examples/movies/README.md @@ -33,11 +33,11 @@ Our project uses gradle. Before running, view the settings in gradle.properties. Here are the steps to setup. ### Setup DB -Setup new DB. Will use basic DB config with no indexes. Will bring in XMI2ES transform to our modules. +Setup a new data with basic DB config with no app-specific indexes. Run the following: -gradle -PenvironmentName=local -i setup deleteGenerated useInitialDBConfig mlDeploy +./gradlew -i setup deleteGenerated useInitialDBConfig mlDeploy Confirm: - Content DB is empty and has no element range indexes @@ -48,35 +48,14 @@ Confirm: * /ext/entity-services/MovieModel-0.0.1.xqy - Converter module for movies. It was generated by ES but tweaked. Pre cooked! * /xmi2es/loadMovieTransformation.xqy - MLCP transform: on ingest of movie source data invokes ES converter module -### Edit the uml2es.gradle to enable index and TDE generation -In the previous step you copied the uml2es.gradle file from the toolkit's uml2esTransform folder. That file is configured to disable TDE and index generation for the ES model. We want TDE and index generation, so let's turn it on. Edit the uml2es.gradle file in this project folder. Change the last block by setting generatedInstanceConverter, generateDatabaseProperties, and generateExtractionTemplate to true. - -Here is what that block should look like: - -/* -Edit this to enable/disable code generation of mlGenerateModelArtifacts -*/ -ext { - def mdb = project.findProperty("mlFinalDbName") - if (mdb == null) mdb = project.findProperty("mlAppName" + "-content") - mlAppConfig { - modelsDatabase=mdb - generateInstanceConverter=true - generateSchema=false - generateDatabaseProperties=true - generateExtractionTemplate=true - generateSearchOptions=true - } -} - ### Transform UML to ES Next, we move our UML model into ML as an ES model. -gradle -b uml2es.gradle -PenvironmentName=local -i -PmodelName=IMDBMovie uDeployModel +./gradlew -b uml2es.gradle -i -PmodelFile=../umlModels/IMDBMovie.xml uDeployModel Confirm: - Content DB has the following documents - * /marklogic.com/entity-services/models/IMDBMovie.json (The ES model) + * /xmi2es/es/IMDBMovie.json (The ES model) * /xmi2es/extension/IMDBMovie.ttl (Semantic triples that extend our model) * /xmi2es/extension/IMDBMovie.txt (A text summary of our model extension) * /xmi2es/findings/IMDBMovie.xml (Problems found during transformation) @@ -88,14 +67,12 @@ Check /xmi2es/findings/IMDBMovie.xml for issues during transform. It should not Notice we made use of the extended model definition. Specifically, we pasted the contents of /xmi2es/extension/IMDBMovie.txt as a block comment into our conversion module plugins/ext/entity-services/IMDBMovie-0.0.1.xqy. We refer back to that comment in several points in the code, showing that our implementation references facts from the extended model. -- In Query Console, open a tab of type SPARQL, point to the content DB, run the following query, and verify you get any results. This means the ES model is in FINAL and its semantic metadata is populated. - -select * where {?s ?o ?p} +### Generate +Generate TDE, DB indexes, and conversion module from the ES model by running the following. -Among the results, you should see the following: -- from basic ES model -- "association" from the extended ES model +./gradlew -i mlGenerateModelArtifacts +Confirm: - In gradle project, check for these newly generated files: * src/main/ml-config/databases/content-database-GENERATED.json - Generated DB config with indexes specified in model. We will use this. * src/main/ml-modules/ext/entity-services/MovieModel-0.0.1-GENERATED.xqy - Generated instance converter. We don't need this because we have the pre-cooked one in the same directory. @@ -108,7 +85,9 @@ Deploy these artifacts: DB indexes, modules and schemas. IT IS VERY IMPORTANT TO Run the following: -gradle -PenvironmentName=local -i useGeneratedDBConfig deleteGenerated mlDeployDatabases mlReloadModules mlReloadSchemas +./gradlew -i useGeneratedDBConfig +./gradlew -i deleteGenerated +./gradlew -i mlDeployDatabases mlReloadModules mlReloadSchemas Confirm: - Content DB now has element range indexes @@ -119,7 +98,7 @@ Ingest movie data based on the model Run the following: -gradle -PenvironmentName=local -i ingestMovieData +./gradlew -i ingestMovieData Confirm: - Content DB now has the movie documents. Check the totals per collection. diff --git a/uml2es/examples/movies/build.gradle b/uml2es/examples/movies/build.gradle index 90b5709..49801d5 100755 --- a/uml2es/examples/movies/build.gradle +++ b/uml2es/examples/movies/build.gradle @@ -1,28 +1,29 @@ + buildscript { - repositories { - jcenter{url "http://jcenter.bintray.com/"} - mavenLocal() - maven { url "http://plugins.gradle.org/m2" } - } - dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" - classpath "net.saliman:gradle-properties-plugin:1.4.6" - } + repositories { + jcenter{url "https://jcenter.bintray.com/"} + mavenLocal() + maven { url "https://plugins.gradle.org/m2" } + } + dependencies { + classpath "com.marklogic:ml-gradle:4.0.1" + classpath "net.saliman:gradle-properties-plugin:1.4.6" + } } apply plugin: "net.saliman.properties" apply plugin: "com.marklogic.ml-gradle" repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } + // Needed for mlcp dependencies + maven { url "https://plugins.gradle.org/m2" } + maven { url "https://developer.marklogic.com/maven2/" } - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } + // Needed for hadoop dependencies for mlcp + maven { url "https://repository.cloudera.com/artifactory/cloudera-repos/" } } configurations { @@ -37,7 +38,7 @@ configurations { } dependencies { - mlcp "com.marklogic:mlcp:9.0.6" + mlcp "com.marklogic:mlcp:9.0.10" mlcp "org.apache.commons:commons-csv:1.2" mlcp files("lib") } @@ -47,12 +48,6 @@ task includeXMI2ESTransform(type: Copy) { into "src/main/ml-modules/root/xmi2es" } -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/IMDBMovie.xml" - into "data/model" -} - task includeUGradle() { // Don't use Copy task bcuz file locking into gradle project dir on Windows doLast { @@ -65,7 +60,6 @@ task includeUGradle() { task setup() { dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') dependsOn('includeUGradle') } @@ -116,7 +110,7 @@ src/main/ml-config/databases/content-database.json is equal to either INITIAL or task useInitialDBConfig(type: Copy) { - from "src/main/ml-config/databases/initial/content-database-INITIAL.json" + from "data/setupdata/content-database-INITIAL.json" into "src/main/ml-config/databases" rename { String fileName -> fileName.replace('-INITIAL', '') @@ -124,10 +118,10 @@ task useInitialDBConfig(type: Copy) { } task useGeneratedDBConfig(type: Copy) { - from "src/main/ml-config/databases/content-database-GENERATED.json" + from "src/main/ml-config/databases/content-database.json.GENERATED" into "src/main/ml-config/databases" rename { String fileName -> - fileName.replace('-GENERATED', '') + fileName.replace('.GENERATED', '') } } @@ -135,8 +129,8 @@ task deleteGenerated(type: Delete) { delete "src/main/ml-schemas/tde/MovieModel-0.0.1.tdex" delete "src/main/ml-schemas/tde/MovieModel-0.0.1-GENERATED.tdex" delete "src/main/ml-schemas/MovieModel-0.0.1-GENERATED.tdex" - delete "src/main/ml-config/databases/content-database-GENERATED.json" - delete "src/main/ml-modules/ext/entity-services/MovieModel-0.0.1-GENERATED.xqy" + delete "src/main/ml-config/databases/content-database.json.GENERATED" + delete "src/main/ml-modules/ext/entity-services/MovieModel-0.0.1.xqy.GENERATED" delete "src/main/ml-modules/options/MovieModel.xml" } diff --git a/uml2es/examples/movies/src/main/ml-config/databases/initial/content-database-INITIAL.json b/uml2es/examples/movies/data/setupdata/content-database-INITIAL.json similarity index 100% rename from uml2es/examples/movies/src/main/ml-config/databases/initial/content-database-INITIAL.json rename to uml2es/examples/movies/data/setupdata/content-database-INITIAL.json diff --git a/uml2es/examples/movies/gradle/wrapper/gradle-wrapper.jar b/uml2es/examples/movies/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c Binary files /dev/null and b/uml2es/examples/movies/gradle/wrapper/gradle-wrapper.jar differ diff --git a/uml2es/examples/movies/gradle/wrapper/gradle-wrapper.properties b/uml2es/examples/movies/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..44e7c4d --- /dev/null +++ b/uml2es/examples/movies/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/uml2es/examples/movies/gradlew b/uml2es/examples/movies/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/uml2es/examples/movies/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/uml2es/examples/movietalk/README.md b/uml2es/examples/movietalk/README.md index b94875b..b801fdf 100644 --- a/uml2es/examples/movietalk/README.md +++ b/uml2es/examples/movietalk/README.md @@ -23,7 +23,7 @@ Setup new DB. Will use basic DB config with no indexes. Will bring in XMI2ES tra Run the following: -gradle -PenvironmentName=local -i setup mlDeploy +./gradlew -i setup mlDeploy Confirm: - New DB and app server created with name xmi2es-examples-movieTalk. @@ -33,7 +33,7 @@ Confirm: We want the logical model in MarkLogic as an Entity Services model. That might sound strange. It's a logical model; why deploy it? We will use it later for a novel purpose: to help build our physical-logical mapping. The logical model we designed in Papyrus lacks enough detail to be used physically anyway. Most of its attributes do not even have a data type. When we deploy the model to MarkLogic as an Entity Services, we will specify the "lax" option to our UML/ES transformation tool. The "lax" option instructs the transformation tool to tolerate the logical model's lack of detail and make a best effort to produce an Entity Services model. To deploy the logical model, run the following: -gradle -b uml2es.gradle -PenvironmentName=local -i -PmodelName=MovieTalk -Plax=true uDeployModel +./gradlew -b uml2es.gradle -i -PmodelFile=../umlModels/MovieTalk.xml -Plax=true uDeployModel Confirm: - Content DB includes several documents created when loading the XMI, including: diff --git a/uml2es/examples/movietalk/build.gradle b/uml2es/examples/movietalk/build.gradle index c344f08..f0174bb 100644 --- a/uml2es/examples/movietalk/build.gradle +++ b/uml2es/examples/movietalk/build.gradle @@ -1,28 +1,29 @@ + buildscript { - repositories { - jcenter{url "http://jcenter.bintray.com/"} - mavenLocal() - maven { url "http://plugins.gradle.org/m2" } - } - dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" - classpath "net.saliman:gradle-properties-plugin:1.4.6" - } + repositories { + jcenter{url "https://jcenter.bintray.com/"} + mavenLocal() + maven { url "https://plugins.gradle.org/m2" } + } + dependencies { + classpath "com.marklogic:ml-gradle:4.0.1" + classpath "net.saliman:gradle-properties-plugin:1.4.6" + } } apply plugin: "net.saliman.properties" apply plugin: "com.marklogic.ml-gradle" repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } + // Needed for mlcp dependencies + maven { url "https://plugins.gradle.org/m2" } + maven { url "https://developer.marklogic.com/maven2/" } - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } + // Needed for hadoop dependencies for mlcp + maven { url "https://repository.cloudera.com/artifactory/cloudera-repos/" } } configurations { @@ -37,22 +38,17 @@ configurations { } dependencies { - mlcp "com.marklogic:mlcp:9.0.6" + mlcp "com.marklogic:mlcp:9.0.10" mlcp "org.apache.commons:commons-csv:1.2" mlcp files("lib") } + task includeXMI2ESTransform(type: Copy) { from "../../uml2esTransform/src/main/ml-modules/root/xmi2es" into "src/main/ml-modules/root/xmi2es" } -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/MovieTalk.xml" - into "data/model" -} - task includeUGradle() { // Don't use Copy task bcuz file locking into gradle project dir on Windows doLast { @@ -65,6 +61,5 @@ task includeUGradle() { task setup() { dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') dependsOn('includeUGradle') } diff --git a/uml2es/examples/movietalk/gradle/wrapper/gradle-wrapper.jar b/uml2es/examples/movietalk/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c Binary files /dev/null and b/uml2es/examples/movietalk/gradle/wrapper/gradle-wrapper.jar differ diff --git a/uml2es/examples/movietalk/gradle/wrapper/gradle-wrapper.properties b/uml2es/examples/movietalk/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..44e7c4d --- /dev/null +++ b/uml2es/examples/movietalk/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/uml2es/examples/movietalk/gradlew b/uml2es/examples/movietalk/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/uml2es/examples/movietalk/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/uml2es/examples/patient-hub/README.md b/uml2es/examples/patient-hub/README.md new file mode 100644 index 0000000..e8efae5 --- /dev/null +++ b/uml2es/examples/patient-hub/README.md @@ -0,0 +1,117 @@ +# Patient Hub: UML2ES in DHF 5 + +## Intro +This example piggybacks on an example included in Data Hub's GitHub repo: the Patient Hub. You can find that example here: . We enhance that example by modeling its entities -- Patient, Admission, Lab, Diagonis -- in UML. We then use UML2ES to convert the UML model to Entity Services. We need to end up with a set of entity definitions that closely resemble the ones provided in the example (in ). Once the entities are in place, the steps to run are just those of the example. + +For convenience, a copy of that example is provided here. + +## Models +We use Papyrus to compose the UML model. The Eclipse project is in data/PatientHubUML. If you would like to view/edit it in Papyrus, import both this project and the profile Eclipse project at [../umlProfile/eclipse/MLProfileProject](../../umlProfile/eclipse/MLProfileProject). Here is what the model looks like: + +![PatientHubPapyrus](../umlModels/PatientHubUML.png) + +## How to run: + +Our project uses gradle. Before running, view the settings in gradle.properties. If you need to modify them, create a file called gradle-local.properties and in this file override any of the properties from gradle.properties. When calling gradle, use the -PenvironmentName=local option to use your local properties. + +Here are the steps to setup. + +### Setup DB +Setup a new hub that includes UML2ES: + +Run the following: + +./gradlew -i hubInit + +./gradlew -i setup + +./gradlew -i mlDeploy + +Confirm: +- In Admin UI, check for new databases and app servers with names starting with xmi2es-examples-patient-hub +- In Query Console, explore the xmi2es-examples-patient-hub-MODULES database. Confirm it has the docuemnt /xmi2es/xmi2esTransform.xqy. + +### Transform UML to ES + +Now we convert the patient UML model to Entity Services. + +First, open in a text editor the file uml2es2DHF5.gradle in your project directory. Check the version of the plugin com.marklogic:marklogic-data-hub being used. It should be 5.1.0. If it is not, edit it and save your changes. + +Then run the following the transform the UML model to ES. + +./gradlew -i -b uml2es4dhf5.gradle -PmodelFile=../umlModels/PatientHubUML.xml uDeployModel + +Confirm: +- You have the file data/entity-services/PatientHubUML.json in your gradle project. +- You have the file data/entity-services-dump/xmi2es/findings/PatienHubUML.xml in your gradle project. Check the contents of this file. It should not indicate any UML-ES conversion issues. + +### Create Hub Entities + +Create DHF entities (like the original ones in the directory entities_fromDHFExample) by running this: + +./gradlew -b uml2es4dhf5.gradle -i uCreateDHFEntities -PmodelFile=../umlModels/PatientHubUML.xml -PentitySelect=stereotype + +Confirm: +- In entities directory of your gradle project are Admissions.entity.json, Patients.entity.json, These are the only entities designated xDHFEntity in the UML model. The other classes -- Labs, Diagnoses -- are not full-fledged DHF entities. + +### Deploy Entities + +Deploy what you just created: + +./gradlew -i hubDeployUserArtifacts mlReloadModules + +### Run Example As Is + +Run the original example! You can run from QuickStart or from command-line using gradle. Here's the gradle way: + +./gradlew -i hubRunFlow -PflowName=Diagnoses + +./gradlew -i hubRunFlow -PflowName=Labs + +./gradlew -i hubRunFlow -PflowName=Admissions + +./gradlew -i hubRunFlow -PflowName=Patients + +Confirm: +- In xmi2es-examples-patient-hub-FINAL database check documents in Patient collection. They should contain admissions, which in turn contain labs and diagnoses: + +``` +{ + "instance": { + "Patient": { + "Admissions": [ + { "Admission": { + "AdmissionID": "1", + "AdmissionStartDate": "1967-06-02 08:43:45.987", + "AdmissionEndDate": "1967-06-14 09:59:12.247", + "Diagnoses": [{ "Diagnosis": {...} }], + "Labs": [{ "Lab": {...} }, + { "Lab": {...} }] + }, + "info": {...} + }, + { "Admission": {...}}, + { "Admission": {...}}, + { "Admission": {...}} + ], + "PatientID": "E250799D-F6DE-4914-ADB4-B08A6E5029B9", + "Gender": "Female", + "DoB": "1945-08-04 19:03:00.757", + "Race": "White", + "Marital-status": "Single", + "Language": "Unknown", + "PercentageBelowPoverty": 12.86 + }, + "info": { + "title": "Patient", + "version": "0.0.1" + } + } +} +``` + + + + + + diff --git a/uml2es/examples/patient-hub/build.gradle b/uml2es/examples/patient-hub/build.gradle new file mode 100755 index 0000000..e30b3ee --- /dev/null +++ b/uml2es/examples/patient-hub/build.gradle @@ -0,0 +1,56 @@ +buildscript { + repositories { + maven {url 'http://developer.marklogic.com/maven2/'} + } +} + +plugins { + id 'java' + id 'eclipse' + id 'idea' + + // This plugin allows you to create different environments + // for your gradle deploy. Each environment is represented + // by a gradle-${env}.properties file + // See https://github.com/stevesaliman/gradle-properties-plugin + // specify the env on the command line with: + // gradle -PenvironmentName=x ... + id 'net.saliman.properties' version '1.4.6' + + // This gradle plugin extends the ml-gradle plugin with + // commands that make the Data Hub Framework do its magic + id 'com.marklogic.ml-data-hub' version '5.1.0' +} + +repositories { + jcenter() + maven {url 'http://developer.marklogic.com/maven2/'} +} + +dependencies { + // this allows you to write custom java code that depends + // on the Data Hub Framework library + compile 'com.marklogic:marklogic-data-hub:5.1.0' + compile 'com.marklogic:marklogic-xcc:9.0.7' +} + + +task includeXMI2ESTransform(type: Copy) { + from "../../uml2esTransform/src/main/ml-modules/root/xmi2es" + into "src/main/ml-modules/root/xmi2es" +} + +task includeUGradle() { + // Don't use Copy task bcuz file locking into gradle project dir on Windows + doLast { + copy { + from "../../uml2esTransform/uml2es4DHF5.gradle" + into "." + } + } +} + +task setup() { + dependsOn('includeXMI2ESTransform') + dependsOn('includeUGradle') +} diff --git a/uml2es/examples/declarativeCity/data/DeclarativeCity/.project b/uml2es/examples/patient-hub/data/PatientHubUML/.project similarity index 85% rename from uml2es/examples/declarativeCity/data/DeclarativeCity/.project rename to uml2es/examples/patient-hub/data/PatientHubUML/.project index 5d374f7..2dc0e67 100644 --- a/uml2es/examples/declarativeCity/data/DeclarativeCity/.project +++ b/uml2es/examples/patient-hub/data/PatientHubUML/.project @@ -1,6 +1,6 @@ - DeclarativeCity + PatientHubUML diff --git a/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.di b/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.di new file mode 100644 index 0000000..bf9abab --- /dev/null +++ b/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.di @@ -0,0 +1,2 @@ + + diff --git a/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.notation b/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.notation new file mode 100644 index 0000000..2258f55 --- /dev/null +++ b/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.notation @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.uml b/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.uml new file mode 100644 index 0000000..239031d --- /dev/null +++ b/uml2es/examples/patient-hub/data/PatientHubUML/PatientHubUML.uml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + diff --git a/uml2es/examples/patient-hub/datasets/admissions-core/AdmissionsCorePopulatedTable.txt b/uml2es/examples/patient-hub/datasets/admissions-core/AdmissionsCorePopulatedTable.txt new file mode 100755 index 0000000..68d6ddf --- /dev/null +++ b/uml2es/examples/patient-hub/datasets/admissions-core/AdmissionsCorePopulatedTable.txt @@ -0,0 +1,373 @@ +PatientID AdmissionID AdmissionStartDate AdmissionEndDate +7A025E77-7832-4F53-B9A7-09A3F98AC17E 7 2011-10-12 14:55:02.027 2011-10-22 01:16:07.557 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 1 1993-02-11 18:57:04.003 1993-02-24 17:22:29.713 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 2 2002-11-28 19:06:31.117 2002-12-04 19:14:40.797 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 3 2011-07-19 18:42:45.287 2011-07-25 04:57:42.053 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 1 1994-12-03 22:20:46.077 1994-12-20 20:24:56.010 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 2 2007-10-26 23:43:13.310 2007-11-01 06:54:26.723 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 3 2009-05-24 16:55:08.567 2009-05-26 20:15:49.657 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 1 1970-05-12 08:54:02.500 1970-05-23 21:22:35.027 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 2 2002-01-09 00:46:30.870 2002-01-12 19:17:15.703 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 3 2008-02-27 05:36:05.627 2008-03-07 01:56:29.463 +0681FA35-A794-4684-97BD-00B88370DB41 1 1998-06-21 17:02:06.170 1998-07-09 14:19:27.510 +0681FA35-A794-4684-97BD-00B88370DB41 2 2010-11-06 11:41:58.847 2010-11-21 17:39:59.450 +2E26695A-EFB0-4C7F-9318-E3030B154E39 1 1988-01-01 21:46:12.720 1988-01-04 08:06:58.813 +2E26695A-EFB0-4C7F-9318-E3030B154E39 2 2012-10-16 18:00:50.050 2012-10-28 15:50:09.043 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 1 1947-03-19 13:22:34.717 1947-03-26 22:43:46.597 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 2 1999-09-02 00:00:01.583 1999-09-05 01:26:43.363 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 3 2005-07-28 01:50:58.930 2005-08-06 09:47:44.790 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 4 2009-04-09 19:08:50.537 2009-04-16 20:22:37.603 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 1 1967-06-02 08:43:45.987 1967-06-14 09:59:12.247 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 2 1983-11-10 04:11:38.053 1983-11-26 04:07:03.140 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 3 1999-04-23 00:03:27.033 1999-05-07 10:14:04.287 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 4 2001-11-11 02:54:41.303 2001-11-14 08:07:24.370 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 5 2010-07-21 19:55:14.637 2010-08-09 17:59:47.437 +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 1 1980-07-19 06:43:54.880 1980-07-25 12:16:06.527 +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 2 2010-10-24 17:36:06.953 2010-11-07 11:56:48.743 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 1 1989-06-14 08:22:05.597 1989-06-20 23:50:43.837 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 2 1995-05-31 09:17:32.943 1995-06-14 21:53:25.230 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 3 2009-11-26 01:44:30.783 2009-11-28 04:11:10.680 +E5478913-6819-4977-BB11-4C8B61175B56 1 2003-11-02 09:24:12.913 2003-11-22 05:04:47.533 +E5478913-6819-4977-BB11-4C8B61175B56 2 2012-08-08 05:21:56.187 2012-08-18 15:13:45.687 +66154E24-D3EE-4311-89DB-6195278F9B3C 1 1964-12-17 00:01:55.227 1964-12-24 11:46:04.590 +66154E24-D3EE-4311-89DB-6195278F9B3C 2 1983-11-01 14:05:42.103 1983-11-10 02:00:24.117 +66154E24-D3EE-4311-89DB-6195278F9B3C 3 1984-10-16 16:46:02.203 1984-10-30 11:03:40.367 +66154E24-D3EE-4311-89DB-6195278F9B3C 4 2005-09-21 10:57:04.053 2005-10-09 12:44:36.707 +66154E24-D3EE-4311-89DB-6195278F9B3C 5 2009-06-25 18:46:14.813 2009-07-10 10:08:45.813 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 1 1972-11-19 13:27:59.980 1972-11-24 20:51:54.413 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 2 2002-07-07 17:13:06.863 2002-07-23 18:13:02.260 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 3 2011-06-14 08:31:38.107 2011-06-25 00:29:44.100 +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 1 1967-04-12 04:38:52.120 1967-04-28 07:08:18.400 +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 2 2011-01-02 01:15:20.380 2011-01-16 20:33:22.587 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 1 1948-07-05 14:58:24.420 1948-07-21 05:49:35.460 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 2 1988-05-21 20:16:46.237 1988-05-26 10:39:11.473 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 3 2010-08-22 10:47:02.917 2010-09-03 03:42:32.747 +3E462A8F-7B90-43A1-A8B6-AD82CB5002C9 1 2013-01-14 04:37:39.037 2013-01-29 14:53:17.903 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 1 1978-08-19 01:42:03.143 1978-08-29 21:16:16.157 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 2 2003-05-10 00:00:51.820 2003-05-19 01:36:47.843 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 3 2009-03-07 05:34:03.073 2009-03-25 07:13:28.233 +A7142B71-A144-4D56-BD14-3E966B01DB37 1 1983-09-15 16:32:28.587 1983-09-21 17:24:27.270 +A7142B71-A144-4D56-BD14-3E966B01DB37 2 1992-06-13 21:58:11.263 1992-06-30 17:16:38.870 +A7142B71-A144-4D56-BD14-3E966B01DB37 3 1993-04-01 00:41:35.363 1993-04-05 07:16:17.447 +A7142B71-A144-4D56-BD14-3E966B01DB37 4 1997-03-10 13:21:34.317 1997-03-14 11:31:59.847 +A7142B71-A144-4D56-BD14-3E966B01DB37 5 2008-08-15 22:41:51.243 2008-08-22 02:09:57.560 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 1 1978-09-18 14:59:25.877 1978-09-24 10:26:14.790 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 2 1996-07-18 11:54:05.500 1996-07-28 23:48:09.407 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 3 2010-06-14 06:39:54.093 2010-06-22 10:21:08.230 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 1 1965-08-08 03:44:16.423 1965-08-24 03:53:46.330 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 2 1967-04-04 19:57:22.033 1967-04-11 05:42:10.533 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 3 1987-07-21 01:39:09.930 1987-07-31 14:32:45.883 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 4 2005-01-17 16:06:58.350 2005-01-24 03:16:22.850 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 5 2008-09-12 11:54:45.020 2008-09-23 08:39:17.050 +1A220558-5996-43E1-AE5D-7B96180FED35 1 1964-02-25 17:05:08.243 1964-03-16 15:09:11.637 +1A220558-5996-43E1-AE5D-7B96180FED35 2 1979-04-18 18:32:25.843 1979-04-21 04:18:01.013 +1A220558-5996-43E1-AE5D-7B96180FED35 3 2012-06-09 18:41:49.740 2012-06-25 08:17:55.600 +7A7332AD-88B1-4848-9356-E5260E477C59 1 1968-09-24 07:49:35.537 1968-10-11 13:09:40.553 +7A7332AD-88B1-4848-9356-E5260E477C59 2 1979-02-10 02:09:18.110 1979-02-23 09:01:35.220 +7A7332AD-88B1-4848-9356-E5260E477C59 3 1985-05-16 23:24:40.390 1985-06-03 18:10:24.500 +7A7332AD-88B1-4848-9356-E5260E477C59 4 2006-01-16 08:54:35.720 2006-02-02 07:25:33.990 +7A7332AD-88B1-4848-9356-E5260E477C59 5 2009-08-22 13:04:16.677 2009-09-10 01:16:39.053 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 1 1980-02-22 23:13:21.727 1980-03-02 22:43:57.087 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 2 2001-02-02 22:56:06.847 2001-02-17 09:59:46.473 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 3 2001-05-18 00:24:34.150 2001-05-26 01:03:12.713 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 4 2011-11-10 14:09:32.013 2011-11-16 22:45:43.603 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 1 2000-03-30 05:44:33.073 2000-04-18 04:09:54.043 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 2 2004-11-11 16:12:00.153 2004-11-20 02:39:47.213 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 3 2008-07-17 01:23:05.590 2008-07-20 08:40:07.723 +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 1 2006-10-31 09:01:42.630 2006-11-03 06:31:05.643 +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 2 2009-02-06 03:02:12.050 2009-02-17 21:50:21.223 +03A481F5-B32A-4A91-BD42-43EB78FEBA77 1 1988-11-25 10:01:04.613 1988-12-01 01:41:51.760 +03A481F5-B32A-4A91-BD42-43EB78FEBA77 2 2008-02-19 17:23:11.790 2008-03-05 07:50:00.083 +2A5251B1-0945-47FA-A65C-7A6381562591 1 1962-06-27 17:38:36.307 1962-07-13 07:11:10.357 +2A5251B1-0945-47FA-A65C-7A6381562591 2 1994-05-06 04:57:00.433 1994-05-20 08:06:03.480 +2A5251B1-0945-47FA-A65C-7A6381562591 3 1998-11-01 20:26:51.947 1998-11-07 18:26:11.330 +2A5251B1-0945-47FA-A65C-7A6381562591 4 2001-02-06 20:48:36.210 2001-02-16 14:25:20.277 +2A5251B1-0945-47FA-A65C-7A6381562591 5 2001-07-04 01:46:42.637 2001-07-09 17:50:38.630 +2A5251B1-0945-47FA-A65C-7A6381562591 6 2009-12-05 06:03:08.493 2009-12-16 17:19:47.710 +8AF47463-8534-4203-B210-C2290F6CE689 1 1974-11-22 11:00:35.987 1974-11-29 20:15:28.313 +8AF47463-8534-4203-B210-C2290F6CE689 2 1998-03-10 07:54:00.890 1998-03-26 02:14:34.737 +8AF47463-8534-4203-B210-C2290F6CE689 3 2005-03-23 02:32:09.067 2005-04-03 07:38:26.190 +8AF47463-8534-4203-B210-C2290F6CE689 4 2005-12-30 05:22:23.737 2006-01-02 10:16:19.067 +8AF47463-8534-4203-B210-C2290F6CE689 5 2011-11-18 01:01:27.167 2011-11-20 19:23:46.317 +135C831F-7DA5-46C0-959C-EBCBD8810B43 1 1993-04-24 06:21:44.210 1993-04-30 07:05:16.027 +135C831F-7DA5-46C0-959C-EBCBD8810B43 2 2001-02-17 08:12:52.013 2001-02-22 05:45:07.190 +135C831F-7DA5-46C0-959C-EBCBD8810B43 3 2002-03-22 09:13:51.577 2002-03-26 19:03:47.040 +135C831F-7DA5-46C0-959C-EBCBD8810B43 4 2007-09-30 01:46:55.247 2007-10-05 17:55:31.143 +135C831F-7DA5-46C0-959C-EBCBD8810B43 5 2010-08-26 05:15:19.353 2010-09-02 19:07:43.873 +8856096E-E59C-4156-A767-C091AF799C80 1 2008-02-03 21:36:34.200 2008-02-11 21:48:33.480 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 1 1962-07-16 22:31:39.413 1962-08-03 20:12:50.693 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 2 1965-09-23 22:38:23.817 1965-10-02 03:55:42.533 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 3 1970-04-24 03:03:41.243 1970-05-08 10:28:24.230 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 4 1973-12-09 19:18:32.577 1973-12-25 08:53:33.347 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 5 2009-07-01 18:32:35.607 2009-07-06 13:29:41.370 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 1 1987-03-04 01:09:21.620 1987-03-22 16:03:05.973 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 2 2003-07-09 22:00:00.733 2003-07-16 04:51:39.403 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 3 2007-09-12 20:32:28.533 2007-09-25 16:06:08.820 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 4 2008-02-13 04:16:00.260 2008-02-28 23:59:29.533 +FB909FAE-72DD-4F6F-9828-D92183DF185F 1 1959-08-17 01:18:01.977 1959-09-01 05:04:25.253 +FB909FAE-72DD-4F6F-9828-D92183DF185F 2 2005-07-31 17:51:35.850 2005-08-06 10:09:42.897 +FB909FAE-72DD-4F6F-9828-D92183DF185F 3 2008-04-05 18:15:52.820 2008-04-15 01:47:51.040 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 1 1968-10-07 11:15:49.617 1968-10-10 20:48:21.037 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 2 1974-06-11 04:59:26.377 1974-06-13 15:31:26.577 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 3 2009-11-09 12:52:06.760 2009-11-26 09:56:15.697 +64182B95-EB72-4E2B-BE77-8050B71498CE 1 1976-08-01 23:23:57.637 1976-08-11 13:43:09.947 +64182B95-EB72-4E2B-BE77-8050B71498CE 2 1991-06-04 15:53:44.050 1991-06-08 13:56:33.150 +64182B95-EB72-4E2B-BE77-8050B71498CE 3 1994-11-11 06:22:43.417 1994-11-26 08:37:11.310 +64182B95-EB72-4E2B-BE77-8050B71498CE 4 2007-08-16 17:46:09.950 2007-08-21 00:47:01.493 +64182B95-EB72-4E2B-BE77-8050B71498CE 5 2009-11-15 12:31:54.603 2009-11-24 21:47:12.637 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 1 1998-05-24 12:03:34.250 1998-05-28 01:02:23.813 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 2 2000-05-06 21:39:48.557 2000-05-13 05:17:46.890 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 3 2007-12-06 17:56:19.800 2007-12-17 06:12:16.897 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 4 2010-08-19 18:39:27.667 2010-09-06 02:33:35.107 +6E70D84D-C75F-477C-BC37-9177C3698C66 1 2003-12-17 15:11:00.517 2004-01-05 00:28:50.210 +6E70D84D-C75F-477C-BC37-9177C3698C66 2 2005-03-22 13:09:36.480 2005-04-07 15:07:19.083 +6E70D84D-C75F-477C-BC37-9177C3698C66 3 2006-10-31 17:04:40.573 2006-11-09 16:50:21.063 +6E70D84D-C75F-477C-BC37-9177C3698C66 4 2009-10-08 18:59:40.783 2009-10-27 15:31:42.900 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 1 1944-07-10 16:52:53.910 1944-07-24 12:09:05.280 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 2 1949-03-20 13:15:57.363 1949-03-22 21:17:17.907 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 3 1984-09-08 20:50:03.823 1984-09-11 22:32:19.557 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 4 2008-05-04 16:00:55.063 2008-05-08 04:09:22.260 +7FD13988-E58A-4A5C-8680-89AC200950FA 1 1988-07-16 23:54:40.207 1988-07-22 15:51:38.123 +7FD13988-E58A-4A5C-8680-89AC200950FA 2 2001-03-11 01:42:18.373 2001-03-22 12:41:43.027 +7FD13988-E58A-4A5C-8680-89AC200950FA 3 2002-03-05 05:16:46.127 2002-03-20 00:36:02.077 +7FD13988-E58A-4A5C-8680-89AC200950FA 4 2011-11-27 09:47:20.783 2011-12-16 09:16:28.150 +C60FE675-CA52-4C55-A233-F4B27E94987F 1 1979-05-09 20:25:53.737 1979-05-24 10:11:21.830 +C60FE675-CA52-4C55-A233-F4B27E94987F 2 2004-07-14 03:19:40.170 2004-07-30 02:13:48.567 +C60FE675-CA52-4C55-A233-F4B27E94987F 3 2005-03-13 12:37:51.210 2005-03-17 15:57:22.823 +C60FE675-CA52-4C55-A233-F4B27E94987F 4 2011-07-05 14:25:03.367 2011-07-22 02:08:27.870 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 1 1959-04-30 18:14:21.373 1959-05-07 17:33:47.207 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 2 1977-01-09 17:35:33.063 1977-01-11 21:02:57.457 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 3 2001-12-19 15:17:51.363 2002-01-06 07:42:52.880 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 4 2004-06-14 21:38:27.687 2004-06-17 05:37:22.647 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 5 2009-11-16 20:32:48.250 2009-11-22 20:25:29.297 +FA157FA5-F488-4884-BF87-E144630D595C 1 1952-11-10 06:35:45.963 1952-11-13 02:51:58.853 +FA157FA5-F488-4884-BF87-E144630D595C 2 1956-06-17 05:42:40.843 1956-06-26 09:13:45.457 +FA157FA5-F488-4884-BF87-E144630D595C 3 2004-10-08 15:25:48.703 2004-10-27 06:23:12.370 +FA157FA5-F488-4884-BF87-E144630D595C 4 2006-11-17 23:46:43.817 2006-11-20 20:47:59.633 +FA157FA5-F488-4884-BF87-E144630D595C 5 2011-05-29 11:43:29.327 2011-06-07 14:13:53.000 +B7E9FC4C-5182-4A34-954E-CEF5FC07E96D 1 2013-07-04 09:52:17.070 2013-07-06 11:22:53.843 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 1 1974-09-30 08:07:27.190 1974-10-20 01:04:22.863 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 2 1975-04-13 09:23:14.533 1975-04-18 19:32:44.147 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 3 1991-07-09 06:10:35.900 1991-07-20 07:16:46.200 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 4 2005-04-17 00:19:38.000 2005-05-01 13:44:30.923 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 5 2011-12-18 15:07:45.877 2011-12-27 22:31:55.597 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 1 1950-12-19 08:27:52.013 1950-12-26 02:02:24.627 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 2 1980-02-18 00:38:33.423 1980-02-25 01:30:17.310 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 3 2004-02-21 21:10:35.930 2004-03-09 18:32:58.217 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 4 2007-08-22 01:44:25.210 2007-09-04 09:53:45.340 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 5 2012-11-28 06:20:37.590 2012-12-09 05:30:51.537 +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 1 2007-03-06 02:24:48.650 2007-03-23 12:59:03.110 +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 2 2010-03-03 19:55:57.810 2010-03-21 03:41:00.950 +7C788499-7798-484B-A027-9FCDC4C0DADB 1 1953-06-14 19:18:55.733 1953-07-03 23:58:55.237 +7C788499-7798-484B-A027-9FCDC4C0DADB 2 2003-09-25 19:24:39.883 2003-10-12 15:34:00.100 +7C788499-7798-484B-A027-9FCDC4C0DADB 3 2008-08-17 00:44:16.073 2008-08-19 10:51:24.287 +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 1 1994-09-02 23:34:00.473 1994-09-12 10:08:13.437 +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 2 2010-03-26 18:58:41.957 2010-04-07 14:30:35.180 +6985D824-3269-4D12-A9DD-B932D640E26E 1 1990-11-11 23:29:02.147 1990-11-20 04:47:55.053 +6985D824-3269-4D12-A9DD-B932D640E26E 2 2012-11-28 00:05:25.923 2012-12-09 01:21:28.267 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 1 1973-11-09 10:52:09.587 1973-11-24 09:13:33.200 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 2 1988-09-09 13:00:15.817 1988-09-28 09:19:10.673 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 3 1997-06-05 04:11:30.533 1997-06-21 12:18:07.373 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 4 2000-07-29 18:37:29.220 2000-08-15 02:45:51.030 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 5 2012-02-07 00:47:47.213 2012-02-19 09:00:11.643 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 1 1997-06-05 06:48:53.927 1997-06-14 21:35:34.520 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 2 2007-09-10 02:39:23.393 2007-09-14 01:33:39.953 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 3 2009-11-22 18:08:25.160 2009-12-03 00:04:59.407 +25B786AF-0F99-478C-9CFA-0EA607E45834 1 1945-10-01 21:44:39.203 1945-10-20 08:37:36.673 +25B786AF-0F99-478C-9CFA-0EA607E45834 2 1977-09-20 07:35:43.320 1977-09-25 05:07:13.843 +25B786AF-0F99-478C-9CFA-0EA607E45834 3 1988-07-20 08:25:47.050 1988-07-30 21:32:26.037 +25B786AF-0F99-478C-9CFA-0EA607E45834 4 2004-08-30 07:06:39.597 2004-09-15 23:36:15.990 +25B786AF-0F99-478C-9CFA-0EA607E45834 5 2006-02-25 15:05:06.463 2006-03-14 18:21:36.333 +25B786AF-0F99-478C-9CFA-0EA607E45834 6 2006-05-22 16:22:43.683 2006-06-01 12:00:05.460 +25B786AF-0F99-478C-9CFA-0EA607E45834 7 2009-02-24 23:03:26.627 2009-03-15 14:30:23.957 +F00C64F8-2033-4640-80FE-F1F62CBE26A5 1 1983-03-07 11:12:50.257 1983-03-16 09:20:24.507 +F00C64F8-2033-4640-80FE-F1F62CBE26A5 2 2007-12-25 13:17:15.453 2008-01-12 12:44:08.357 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 1 1982-11-04 04:38:45.913 1982-11-10 22:46:46.303 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 2 1986-06-28 09:01:05.200 1986-07-17 13:57:47.210 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 3 1999-10-14 05:24:54.653 1999-10-29 01:06:47.197 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 4 2008-06-02 22:32:16.550 2008-06-06 12:10:07.683 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 1 1968-09-30 23:25:10.637 1968-10-07 19:54:05.980 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 2 1996-09-09 00:13:40.573 1996-09-12 20:12:05.497 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 3 2002-08-31 02:51:45.053 2002-09-07 00:13:23.420 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 4 2002-09-16 20:00:22.203 2002-09-25 20:40:24.270 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 5 2007-03-12 11:04:02.373 2007-03-25 02:03:18.803 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 6 2012-04-04 02:50:01.320 2012-04-21 03:29:21.530 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 1992-06-27 03:00:01.530 1992-07-01 23:04:55.493 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 2005-07-24 07:42:39.330 2005-08-06 19:45:17.540 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 2011-12-16 08:24:10.400 2011-12-25 10:34:06.080 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 1 1953-11-24 22:57:18.750 1953-12-02 14:20:43.280 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 2 1979-09-12 10:06:30.157 1979-09-23 00:47:01.730 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 3 1994-08-23 07:08:59.557 1994-08-25 08:06:55.543 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 4 2004-12-10 19:29:29.720 2004-12-17 19:58:02.123 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 5 2006-03-30 17:22:23.473 2006-04-02 11:23:01.830 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 2007-02-09 15:32:56.377 2007-02-28 16:28:37.023 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 2008-05-11 09:39:25.037 2008-05-17 01:33:42.903 +220C8D43-1322-4A9D-B890-D426942A3649 1 1995-04-28 18:02:38.403 1995-05-03 22:27:12.163 +220C8D43-1322-4A9D-B890-D426942A3649 2 1997-09-21 11:20:02.637 1997-10-05 17:58:26.743 +220C8D43-1322-4A9D-B890-D426942A3649 3 2000-09-23 17:16:09.810 2000-10-04 16:44:14.310 +220C8D43-1322-4A9D-B890-D426942A3649 4 2011-01-25 23:19:10.720 2011-02-02 22:06:51.877 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 1987-10-06 14:54:32.710 1987-10-19 13:20:04.480 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 2 2005-06-16 05:33:19.090 2005-06-24 01:25:21.270 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 3 2010-02-25 20:15:28.500 2010-03-04 07:24:29.877 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 1 1941-11-09 09:21:21.510 1941-11-17 19:53:00.300 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 2008-05-20 23:06:06.983 2008-06-08 19:02:02.223 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 1974-01-22 09:45:09.890 1974-02-01 04:38:09.187 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 2 1991-05-06 03:31:18.457 1991-05-18 11:35:10.817 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 3 2003-12-21 00:30:19.433 2003-12-28 07:40:44.163 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 4 2010-01-08 13:16:16.433 2010-01-22 21:05:42.890 +FFCDECD6-4048-4DCB-B910-1218160005B3 1 1968-07-05 06:48:58.117 1968-07-23 10:49:12.563 +FFCDECD6-4048-4DCB-B910-1218160005B3 2 1999-12-18 17:55:30.370 1999-12-29 22:10:37.913 +FFCDECD6-4048-4DCB-B910-1218160005B3 3 2012-10-18 09:33:12.933 2012-11-01 04:14:26.027 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 1 1988-12-02 05:42:32.720 1988-12-16 13:23:08.807 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 2 2006-10-10 15:19:36.480 2006-10-29 00:14:52.633 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 3 2006-12-25 04:58:36.060 2007-01-13 09:26:36.727 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 4 2009-09-12 00:55:35.003 2009-09-20 12:22:33.137 +A50BE9B4-8A0B-4169-B894-F7BD86D7D90B 1 2010-10-25 12:30:21.223 2010-10-31 11:06:07.027 +69CC25ED-A54A-4BAF-97E3-774BB3C9DED1 1 1999-04-21 10:52:48.653 1999-05-08 08:52:28.027 +69CC25ED-A54A-4BAF-97E3-774BB3C9DED1 2 2009-12-21 18:48:52.093 2009-12-26 00:30:07.090 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 1 1976-02-24 17:42:25.660 1976-03-03 08:44:56.803 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 2 1977-01-05 19:55:00.627 1977-01-22 05:36:40.007 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 3 1980-11-26 05:32:36.187 1980-12-01 15:43:05.137 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 4 1999-05-07 14:39:54.653 1999-05-23 11:36:49.223 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 5 2009-09-28 05:33:50.440 2009-09-30 22:06:53.447 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 1 1988-06-21 04:54:48.510 1988-07-08 07:48:15.020 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 2 1988-11-08 08:36:04.737 1988-11-19 12:35:31.670 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 3 2002-12-08 06:20:37.083 2002-12-27 06:02:58.280 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 4 2009-03-29 14:32:01.223 2009-04-03 08:02:22.683 +967987B9-FFEF-4776-85CF-AE05CA81F583 1 1971-05-09 07:22:26.180 1971-05-12 03:17:30.893 +967987B9-FFEF-4776-85CF-AE05CA81F583 2 1994-09-17 21:24:51.097 1994-10-06 17:55:04.573 +967987B9-FFEF-4776-85CF-AE05CA81F583 3 2004-01-08 15:30:51.650 2004-01-16 21:19:12.563 +967987B9-FFEF-4776-85CF-AE05CA81F583 4 2007-01-18 18:47:05.583 2007-02-07 10:16:25.880 +967987B9-FFEF-4776-85CF-AE05CA81F583 5 2009-12-31 19:58:25.370 2010-01-03 01:23:31.680 +9BBF3A51-443D-438B-9289-B98B8E0577C0 1 1971-09-16 03:52:41.700 1971-09-22 04:45:47.350 +9BBF3A51-443D-438B-9289-B98B8E0577C0 2 2009-10-17 21:08:38.197 2009-11-02 10:36:05.957 +6D8008ED-D623-4BE4-B93B-335F9797C170 1 2001-05-13 14:49:12.153 2001-05-25 10:04:02.897 +6D8008ED-D623-4BE4-B93B-335F9797C170 2 2004-12-04 14:16:27.993 2004-12-17 11:07:24.303 +6D8008ED-D623-4BE4-B93B-335F9797C170 3 2012-01-02 06:58:15.063 2012-01-20 14:29:55.523 +B3892204-880B-40EF-B3BB-B824B50E99E5 1 2000-08-17 23:19:49.277 2000-09-03 06:21:54.673 +B3892204-880B-40EF-B3BB-B824B50E99E5 2 2001-09-03 18:44:08.870 2001-09-23 15:26:58.383 +B3892204-880B-40EF-B3BB-B824B50E99E5 3 2012-02-24 06:24:35.893 2012-03-09 21:54:32.307 +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 1 1983-06-01 19:50:33.977 1983-06-07 02:58:10.193 +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 2 2011-04-11 06:49:54.353 2011-04-30 03:04:12.240 +7548B6CF-79D9-461D-A0C5-20B861406FAC 1 1982-08-23 17:35:47.147 1982-09-05 16:20:45.987 +7548B6CF-79D9-461D-A0C5-20B861406FAC 2 2000-09-22 02:19:57.300 2000-10-03 02:27:31.373 +7548B6CF-79D9-461D-A0C5-20B861406FAC 3 2003-04-14 06:42:17.997 2003-04-29 10:51:27.057 +7548B6CF-79D9-461D-A0C5-20B861406FAC 4 2008-10-13 18:21:22.910 2008-10-23 18:38:15.857 +B5D31F01-7273-4901-B56F-8139769A11EF 1 1997-04-22 04:24:08.750 1997-05-06 08:20:43.170 +B5D31F01-7273-4901-B56F-8139769A11EF 2 2004-08-23 05:16:57.480 2004-08-27 11:50:54.573 +B5D31F01-7273-4901-B56F-8139769A11EF 3 2010-07-03 10:53:49.617 2010-07-15 13:32:19.510 +80D356B4-F974-441F-A5F2-F95986D119A2 1 1965-01-29 09:25:37.200 1965-02-10 00:57:57.970 +80D356B4-F974-441F-A5F2-F95986D119A2 2 1970-09-05 18:51:46.390 1970-09-22 22:21:45.263 +80D356B4-F974-441F-A5F2-F95986D119A2 3 1984-05-31 18:34:12.660 1984-06-11 05:01:40.287 +80D356B4-F974-441F-A5F2-F95986D119A2 4 1990-05-02 22:55:11.220 1990-05-22 13:38:51.950 +80D356B4-F974-441F-A5F2-F95986D119A2 5 1991-12-11 07:04:48.687 1991-12-26 05:07:29.543 +80D356B4-F974-441F-A5F2-F95986D119A2 6 2007-09-19 18:38:24.610 2007-10-06 16:49:16.640 +80D356B4-F974-441F-A5F2-F95986D119A2 7 2012-10-28 00:36:29.513 2012-11-09 06:05:58.093 +A0A976C8-9B30-4492-B8C4-5B25095B9192 1 1949-07-10 00:17:08.037 1949-07-26 11:53:13.577 +A0A976C8-9B30-4492-B8C4-5B25095B9192 2 1951-08-12 17:27:34.267 1951-08-17 10:50:34.113 +A0A976C8-9B30-4492-B8C4-5B25095B9192 3 1954-01-06 06:36:07.547 1954-01-18 06:04:00.080 +A0A976C8-9B30-4492-B8C4-5B25095B9192 4 1967-12-01 13:31:48.583 1967-12-08 11:12:29.007 +A0A976C8-9B30-4492-B8C4-5B25095B9192 5 1996-04-20 01:55:09.940 1996-04-29 16:13:32.697 +A0A976C8-9B30-4492-B8C4-5B25095B9192 6 2005-06-20 15:16:06.220 2005-07-06 18:13:08.123 +A0A976C8-9B30-4492-B8C4-5B25095B9192 7 2012-11-09 22:54:29.000 2012-11-27 09:39:56.087 +016A590E-D093-4667-A5DA-D68EA6987D93 1 1986-11-30 19:41:09.330 1986-12-06 09:59:54.020 +016A590E-D093-4667-A5DA-D68EA6987D93 2 1998-06-04 23:05:09.147 1998-06-11 22:43:02.203 +016A590E-D093-4667-A5DA-D68EA6987D93 3 1999-10-28 17:26:06.743 1999-11-09 01:25:13.733 +016A590E-D093-4667-A5DA-D68EA6987D93 4 2001-03-18 18:39:56.843 2001-03-27 18:22:45.747 +016A590E-D093-4667-A5DA-D68EA6987D93 5 2008-02-22 06:52:39.087 2008-03-03 19:20:29.737 +3B11D6B3-A36A-4B69-A437-C29BF425A941 1 1980-12-21 14:53:39.143 1981-01-01 03:11:53.817 +3B11D6B3-A36A-4B69-A437-C29BF425A941 2 2004-05-11 15:14:37.337 2004-05-28 00:23:17.697 +3B11D6B3-A36A-4B69-A437-C29BF425A941 3 2009-01-20 01:06:17.317 2009-02-06 20:05:00.943 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 1 1971-05-26 20:08:10.073 1971-06-04 14:43:59.993 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 2 2003-04-09 18:42:15.223 2003-04-29 16:41:43.547 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 3 2007-07-10 16:11:25.767 2007-07-12 16:31:49.420 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 4 2011-01-21 12:43:55.883 2011-01-29 04:31:59.350 +B2EB15FA-5431-4804-9309-4215BDC778C0 1 1970-02-27 17:16:23.907 1970-03-04 08:16:49.903 +B2EB15FA-5431-4804-9309-4215BDC778C0 2 1984-03-03 02:15:39.583 1984-03-16 05:06:14.467 +B2EB15FA-5431-4804-9309-4215BDC778C0 3 2010-04-25 17:59:39.993 2010-05-10 05:48:23.413 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 1 1942-07-30 04:45:36.667 1942-08-10 21:35:50.310 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 2 1976-12-12 03:22:51.097 1976-12-20 09:34:30.910 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 3 1983-06-22 05:57:03.520 1983-07-09 21:05:20.913 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 4 1991-09-13 04:27:45.010 1991-09-23 16:08:23.257 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 5 2007-05-16 22:50:17.000 2007-05-27 00:08:37.830 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 6 2010-01-07 01:04:58.483 2010-01-20 06:37:13.387 +C5D09468-574F-4802-B56F-DB38F4EB1687 1 1959-09-12 08:02:27.580 1959-09-24 09:25:08.323 +C5D09468-574F-4802-B56F-DB38F4EB1687 2 1975-04-14 01:27:24.847 1975-04-26 05:52:48.173 +C5D09468-574F-4802-B56F-DB38F4EB1687 3 2006-05-22 23:29:02.183 2006-06-01 19:53:07.043 +C5D09468-574F-4802-B56F-DB38F4EB1687 4 2011-03-30 14:44:18.413 2011-04-15 03:37:15.953 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 1 1993-09-17 22:24:49.573 1993-09-23 00:29:45.467 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 2 1994-02-06 17:58:00.583 1994-02-26 11:44:26.100 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 3 2002-03-06 21:09:42.670 2002-03-23 05:43:46.137 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 4 2008-03-22 11:25:37.977 2008-03-26 17:58:11.653 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 1 1989-09-23 21:57:50.250 1989-10-12 23:31:11.120 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 2 1994-04-01 07:22:17.723 1994-04-12 00:43:17.050 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 3 2003-04-21 00:40:36.057 2003-05-09 02:14:42.870 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 4 2005-02-04 17:30:47.467 2005-02-12 12:00:54.490 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 5 2012-11-19 11:46:10.477 2012-11-28 08:51:41.647 +868E700E-3C56-458F-A477-078D671DCB20 1 2002-11-29 12:35:04.863 2002-12-13 14:44:44.223 +868E700E-3C56-458F-A477-078D671DCB20 2 2008-12-27 02:32:08.560 2009-01-03 03:40:33.080 +56A35E74-90BE-44A0-B7BA-7743BB152133 1 1993-04-08 18:51:30.217 1993-04-16 12:24:50.617 +56A35E74-90BE-44A0-B7BA-7743BB152133 2 2003-09-25 03:25:19.470 2003-10-11 16:54:53.707 +56A35E74-90BE-44A0-B7BA-7743BB152133 3 2010-12-31 21:08:31.323 2011-01-04 09:51:53.613 +CC12B481-B516-455B-884F-4CA900B29F2E 1 2004-01-11 20:03:43.343 2004-01-23 05:28:39.113 +CC12B481-B516-455B-884F-4CA900B29F2E 2 2006-12-11 02:54:25.237 2006-12-29 03:36:05.053 +CC12B481-B516-455B-884F-4CA900B29F2E 3 2012-04-24 21:33:37.117 2012-04-29 16:21:19.187 +714823AF-C52C-414C-B53B-C43EACD194C3 1 1970-08-04 06:53:42.187 1970-08-08 11:37:59.357 +714823AF-C52C-414C-B53B-C43EACD194C3 2 1992-08-31 17:52:29.337 1992-09-11 18:47:37.603 +714823AF-C52C-414C-B53B-C43EACD194C3 3 2011-06-05 17:23:27.803 2011-06-14 14:38:37.950 +3231F930-2978-4F50-8234-755449851E7B 1 2000-07-09 20:04:33.343 2000-07-14 13:14:03.380 +3231F930-2978-4F50-8234-755449851E7B 2 2004-01-23 20:25:40.860 2004-02-09 00:29:25.150 +3231F930-2978-4F50-8234-755449851E7B 3 2006-05-23 03:49:40.170 2006-06-11 19:46:35.217 +3231F930-2978-4F50-8234-755449851E7B 4 2007-05-23 02:25:04.377 2007-05-30 23:04:12.863 +3231F930-2978-4F50-8234-755449851E7B 5 2009-07-16 00:40:38.197 2009-08-04 12:13:10.353 +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 1 1988-02-26 07:12:10.023 1988-03-07 06:17:20.400 +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 2 2008-06-20 16:18:54.877 2008-06-23 18:31:59.190 +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 1 2007-10-03 21:18:19.710 2007-10-12 21:39:15.177 +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 2 2010-07-22 15:27:29.767 2010-08-06 05:59:30.037 +21792512-2D40-4326-BEA2-A40127EB24FF 1 1960-10-15 20:58:29.703 1960-10-28 23:12:33.417 +21792512-2D40-4326-BEA2-A40127EB24FF 2 1961-08-14 08:45:03.500 1961-08-24 20:14:22.873 +21792512-2D40-4326-BEA2-A40127EB24FF 3 1966-12-25 21:37:45.317 1967-01-08 22:00:23.510 +21792512-2D40-4326-BEA2-A40127EB24FF 4 1995-11-04 08:08:31.320 1995-11-11 18:20:13.820 +21792512-2D40-4326-BEA2-A40127EB24FF 5 2006-02-20 08:28:21.110 2006-02-28 05:42:48.340 +21792512-2D40-4326-BEA2-A40127EB24FF 6 2012-02-08 09:04:59.963 2012-02-11 09:59:20.380 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 1 1987-01-10 08:09:16.500 1987-01-21 00:50:49.120 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 2 1998-12-29 01:14:39.423 1999-01-04 07:18:56.027 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 3 2004-01-17 23:29:41.843 2004-01-28 01:36:51.720 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 4 2012-12-26 09:21:10.550 2013-01-12 18:16:11.020 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 1 1982-12-12 12:29:14.560 1982-12-24 09:13:53.463 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 2 2002-12-31 05:46:14.717 2003-01-10 11:14:14.587 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 3 2010-01-27 05:50:32.723 2010-01-30 04:03:24.850 +36775002-9EC3-4889-AD4F-80DC6855C8D8 1 1990-12-14 05:39:13.747 1991-01-01 01:23:47.820 +36775002-9EC3-4889-AD4F-80DC6855C8D8 2 1992-08-15 19:48:30.000 1992-09-01 16:03:16.897 +36775002-9EC3-4889-AD4F-80DC6855C8D8 3 1992-09-27 02:44:16.097 1992-10-10 12:42:44.060 +36775002-9EC3-4889-AD4F-80DC6855C8D8 4 2004-10-01 02:09:01.190 2004-10-17 20:21:53.893 +36775002-9EC3-4889-AD4F-80DC6855C8D8 5 2005-03-09 06:02:37.550 2005-03-16 18:16:35.707 +36775002-9EC3-4889-AD4F-80DC6855C8D8 6 2008-01-30 13:47:43.490 2008-02-16 17:13:59.847 +4C201C71-CCED-40D1-9642-F9C8C485B854 1 1945-03-13 14:37:16.017 1945-03-26 16:07:42.110 +4C201C71-CCED-40D1-9642-F9C8C485B854 2 1956-02-14 14:10:35.737 1956-03-04 18:23:51.753 +4C201C71-CCED-40D1-9642-F9C8C485B854 3 1977-11-23 14:42:31.387 1977-12-10 06:58:09.767 +4C201C71-CCED-40D1-9642-F9C8C485B854 4 1993-12-20 17:02:35.973 1993-12-28 11:52:18.707 +4C201C71-CCED-40D1-9642-F9C8C485B854 5 1997-04-01 15:15:29.713 1997-04-05 09:22:39.530 +4C201C71-CCED-40D1-9642-F9C8C485B854 6 2012-09-22 18:05:49.240 2012-10-05 05:06:10.750 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 1 1991-10-19 23:31:13.850 1991-11-03 15:00:21.597 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 2 2000-02-18 02:15:46.473 2000-03-03 06:26:57.133 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 3 2008-05-09 19:22:35.157 2008-05-28 03:42:47.820 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 1 1982-10-05 20:41:01.813 1982-10-17 21:39:57.057 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 2 2005-11-27 21:49:31.010 2005-11-30 20:23:48.277 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 3 2011-01-25 01:31:17.090 2011-02-09 12:30:19.433 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 1 1985-08-25 05:16:35.700 1985-09-10 03:54:56.920 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 2 1994-07-22 07:12:50.407 1994-07-28 12:29:05.827 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 3 2003-03-02 09:59:11.540 2003-03-22 01:31:32.883 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 4 2007-07-03 20:00:07.223 2007-07-08 14:23:38.367 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 5 2012-04-13 13:23:12.527 2012-04-24 21:10:59.800 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 1 1980-07-15 11:20:35.480 1980-07-24 09:05:29.623 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 2 2003-01-23 15:16:00.507 2003-01-27 14:11:06.370 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 3 2004-09-24 11:39:44.227 2004-10-11 19:23:34.477 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 4 2004-10-17 05:19:47.157 2004-10-26 03:29:23.560 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 5 2012-01-10 18:36:46.137 2012-01-27 23:05:49.653 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 1 1978-06-29 07:29:11.593 1978-07-10 04:05:51.787 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 2 1982-10-14 07:01:43.613 1982-10-21 16:44:00.310 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 3 1990-02-23 04:28:34.457 1990-03-13 15:55:29.837 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 4 1994-05-15 11:34:00.840 1994-05-19 23:04:04.877 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 5 2001-01-10 11:04:58.943 2001-01-27 00:54:18.730 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 6 2001-12-29 20:28:01.050 2002-01-18 18:16:04.423 diff --git a/uml2es/examples/patient-hub/datasets/diagnoses-core/DiagnosesCorePopulatedTable.txt b/uml2es/examples/patient-hub/datasets/diagnoses-core/DiagnosesCorePopulatedTable.txt new file mode 100755 index 0000000..29fcffe --- /dev/null +++ b/uml2es/examples/patient-hub/datasets/diagnoses-core/DiagnosesCorePopulatedTable.txt @@ -0,0 +1,373 @@ +PatientID AdmissionID PrimaryDiagnosisCode PrimaryDiagnosisDescription +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 2 M01.X Direct infection of joint in infectious and parasitic diseases classified elsewhere +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 3 D65 Disseminated intravascular coagulation [defibrination syndrome] +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 4 C92.1 Chronic myeloid leukemia, BCR/ABL-positive +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 5 M05.51 Rheumatoid polyneuropathy with rheumatoid arthritis of shoulder +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 1 C91.00 Acute lymphoblastic leukemia not having achieved remission +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 2 G55 Nerve root and plexus compressions in diseases classified elsewhere +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 3 M51 Thoracic, thoracolumbar, and lumbosacral intervertebral disc disorders +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 4 O04.82 Renal failure following (induced) termination of pregnancy +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 5 C33 Malignant neoplasm of trachea +7A025E77-7832-4F53-B9A7-09A3F98AC17E 1 M05.442 Rheumatoid myopathy with rheumatoid arthritis of left hand +7A025E77-7832-4F53-B9A7-09A3F98AC17E 2 F12.15 Cannabis abuse with psychotic disorder +7A025E77-7832-4F53-B9A7-09A3F98AC17E 3 E10.43 Type 1 diabetes mellitus with diabetic autonomic (poly)neuropathy +7A025E77-7832-4F53-B9A7-09A3F98AC17E 4 M12.162 Kaschin-Beck disease, left knee +7A025E77-7832-4F53-B9A7-09A3F98AC17E 5 T43.3X1 Poisoning by phenothiazine antipsychotics and neuroleptics, accidental (unintentional) +7A025E77-7832-4F53-B9A7-09A3F98AC17E 6 C54.3 Malignant neoplasm of fundus uteri +7A025E77-7832-4F53-B9A7-09A3F98AC17E 7 F06.3 Mood disorder due to known physiological condition +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 1 K91 Intraoperative and postprocedural complications and disorders of digestive system, not elsewhere classified +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 2 F40.01 Agoraphobia with panic disorder +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 3 C40.11 Malignant neoplasm of short bones of right upper limb +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 1 M05.752 Rheumatoid arthritis with rheumatoid factor of left hip without organ or systems involvement +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 2 I97.81 Intraoperative cerebrovascular infarction +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 3 D37.02 Neoplasm of uncertain behavior of tongue +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 1 C94.6 Myelodysplastic disease, not classified +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 2 M05.49 Rheumatoid myopathy with rheumatoid arthritis of multiple sites +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 3 M84.51 Pathological fracture in neoplastic disease, shoulder +0681FA35-A794-4684-97BD-00B88370DB41 1 C92.51 Acute myelomonocytic leukemia, in remission +0681FA35-A794-4684-97BD-00B88370DB41 2 M02.38 Reiter's disease, vertebrae +2E26695A-EFB0-4C7F-9318-E3030B154E39 1 D12.7 Benign neoplasm of rectosigmoid junction +2E26695A-EFB0-4C7F-9318-E3030B154E39 2 C38.2 Malignant neoplasm of posterior mediastinum +DDC0BC57-7A4E-4E02-9282-177750B74FBC 1 C79.72 Secondary malignant neoplasm of left adrenal gland +DDC0BC57-7A4E-4E02-9282-177750B74FBC 2 B95.62 Methicillin resistant Staphylococcus aureus infection as the cause of diseases classified elsewhere +DDC0BC57-7A4E-4E02-9282-177750B74FBC 3 C05.1 Malignant neoplasm of soft palate +DDC0BC57-7A4E-4E02-9282-177750B74FBC 4 A52.0 Cardiovascular and cerebrovascular syphilis +E250799D-F6DE-4914-ADB4-B08A6E5029B9 1 M06.31 Rheumatoid nodule, shoulder +E250799D-F6DE-4914-ADB4-B08A6E5029B9 2 E09.62 Drug or chemical induced diabetes mellitus with skin complications +E250799D-F6DE-4914-ADB4-B08A6E5029B9 3 T43.3X Poisoning by, adverse effect of and underdosing of phenothiazine antipsychotics and neuroleptics +E250799D-F6DE-4914-ADB4-B08A6E5029B9 4 F21 Schizotypal disorder +E250799D-F6DE-4914-ADB4-B08A6E5029B9 5 C37 Malignant neoplasm of thymus +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 1 Z13.810 Encounter for screening for upper gastrointestinal disorder +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 2 O24.410 Gestational diabetes mellitus in pregnancy, diet controlled +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 1 Z13.83 Encounter for screening for respiratory disorder NEC +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 2 F45.41 Pain disorder exclusively related to psychological factors +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 3 M06.222 Rheumatoid bursitis, left elbow +E5478913-6819-4977-BB11-4C8B61175B56 1 D39.12 Neoplasm of uncertain behavior of left ovary +E5478913-6819-4977-BB11-4C8B61175B56 2 M84.552 Pathological fracture in neoplastic disease, left femur +66154E24-D3EE-4311-89DB-6195278F9B3C 1 O99.41 Diseases of the circulatory system complicating pregnancy +66154E24-D3EE-4311-89DB-6195278F9B3C 2 O04.86 Cardiac arrest following (induced) termination of pregnancy +66154E24-D3EE-4311-89DB-6195278F9B3C 3 B97.11 Coxsackievirus as the cause of diseases classified elsewhere +66154E24-D3EE-4311-89DB-6195278F9B3C 4 B97.34 Human T-cell lymphotrophic virus, type II [HTLV-II] as the cause of diseases classified elsewhere +66154E24-D3EE-4311-89DB-6195278F9B3C 5 D37.3 Neoplasm of uncertain behavior of appendix +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 1 O07.32 Renal failure following failed attempted termination of pregnancy +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 2 D28.0 Benign neoplasm of vulva +FA157FA5-F488-4884-BF87-E144630D595C 3 J44.1 Chronic obstructive pulmonary disease with (acute) exacerbation +FA157FA5-F488-4884-BF87-E144630D595C 4 D14.0 Benign neoplasm of middle ear, nasal cavity and accessory sinuses +FA157FA5-F488-4884-BF87-E144630D595C 5 Z13.85 Encounter for screening for nervous system disorders +B7E9FC4C-5182-4A34-954E-CEF5FC07E96D 1 E10.630 Type 1 diabetes mellitus with periodontal disease +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 1 F11 Opioid related disorders +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 2 H47.631 Disorders of visual cortex in (due to) neoplasm, right side of brain +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 3 C92.0 Acute myeloblastic leukemia +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 4 C41.0 Malignant neoplasm of bones of skull and face +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 5 M90.53 Osteonecrosis in diseases classified elsewhere, forearm +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 1 D13.1 Benign neoplasm of stomach +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 2 M02.35 Reiter's disease, hip +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 3 C71.4 Malignant neoplasm of occipital lobe +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 4 Z22.31 Carrier of bacterial disease due to meningococci +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 5 C47.2 Malignant neoplasm of peripheral nerves of lower limb, including hip +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 1 F31.4 Bipolar disorder, current episode depressed, severe, without psychotic features +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 2 K76.5 Hepatic veno-occlusive disease +7C788499-7798-484B-A027-9FCDC4C0DADB 1 O10.113 Pre-existing hypertensive heart disease complicating pregnancy, third trimester +7C788499-7798-484B-A027-9FCDC4C0DADB 2 E09.649 Drug or chemical induced diabetes mellitus with hypoglycemia without coma +7C788499-7798-484B-A027-9FCDC4C0DADB 3 D37.1 Neoplasm of uncertain behavior of stomach +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 1 N49.2 Inflammatory disorders of scrotum +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 2 I15.2 Hypertension secondary to endocrine disorders +6985D824-3269-4D12-A9DD-B932D640E26E 1 I25.82 Chronic total occlusion of coronary artery +6985D824-3269-4D12-A9DD-B932D640E26E 2 M26.6 Temporomandibular joint disorders +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 1 C51.2 Malignant neoplasm of clitoris +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 2 C40.11 Malignant neoplasm of short bones of right upper limb +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 3 E08.42 Diabetes mellitus due to underlying condition with diabetic polyneuropathy +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 4 E08.32 Diabetes mellitus due to underlying condition with mild nonproliferative diabetic retinopathy +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 5 M11.052 Hydroxyapatite deposition disease, left hip +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 1 H75.01 Mastoiditis in infectious and parasitic diseases classified elsewhere, right ear +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 2 I97.110 Postprocedural cardiac insufficiency following cardiac surgery +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 3 B08.72 Yaba pox virus disease +25B786AF-0F99-478C-9CFA-0EA607E45834 1 M01.X5 Direct infection of hip in infectious and parasitic diseases classified elsewhere +25B786AF-0F99-478C-9CFA-0EA607E45834 2 M63.831 Disorders of muscle in diseases classified elsewhere, right forearm +25B786AF-0F99-478C-9CFA-0EA607E45834 3 G60.1 Refsum's disease +25B786AF-0F99-478C-9CFA-0EA607E45834 4 M05.75 Rheumatoid arthritis with rheumatoid factor of hip without organ or systems involvement +25B786AF-0F99-478C-9CFA-0EA607E45834 5 E08.64 Diabetes mellitus due to underlying condition with hypoglycemia +25B786AF-0F99-478C-9CFA-0EA607E45834 6 Z22.31 Carrier of bacterial disease due to meningococci +25B786AF-0F99-478C-9CFA-0EA607E45834 7 M02.352 Reiter's disease, left hip +F00C64F8-2033-4640-80FE-F1F62CBE26A5 1 E10.339 Type 1 diabetes mellitus with moderate nonproliferative diabetic retinopathy without macular edema +F00C64F8-2033-4640-80FE-F1F62CBE26A5 2 C40.81 Malignant neoplasm of overlapping sites of bone and articular cartilage of right limb +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 1 C19 Malignant neoplasm of rectosigmoid junction +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 2 B96.2 Escherichia coli [E. coli ] as the cause of diseases classified elsewhere +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 3 O98.611 Protozoal diseases complicating pregnancy, first trimester +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 4 C18.6 Malignant neoplasm of descending colon +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 1 I67.81 Acute cerebrovascular insufficiency +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 2 C94.02 Acute erythroid leukemia, in relapse +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 3 N18.4 Chronic kidney disease, stage 4 (severe) +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 4 O99.35 Diseases of the nervous system complicating pregnancy, childbirth, and the puerperium +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 5 D63 Anemia in chronic diseases classified elsewhere +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 6 I51.3 Intracardiac thrombosis, not elsewhere classified +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 C92.50 Acute myelomonocytic leukemia, not having achieved remission +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 T46.3X6 Underdosing of coronary vasodilators +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 C15.8 Malignant neoplasm of overlapping sites of esophagus +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 1 I25.84 Coronary atherosclerosis due to calcified coronary lesion +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 2 M11.072 Hydroxyapatite deposition disease, left ankle and foot +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 3 H47.42 Disorders of optic chiasm in (due to) neoplasm +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 4 M12.162 Kaschin-Beck disease, left knee +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 5 M12.111 Kaschin-Beck disease, right shoulder +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 E79 Disorders of purine and pyrimidine metabolism +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 A42.0 Pulmonary actinomycosis +220C8D43-1322-4A9D-B890-D426942A3649 1 M63 Disorders of muscle in diseases classified elsewhere +220C8D43-1322-4A9D-B890-D426942A3649 2 M72 Fibroblastic disorders +220C8D43-1322-4A9D-B890-D426942A3649 3 J14 Pneumonia due to Hemophilus influenzae +220C8D43-1322-4A9D-B890-D426942A3649 4 M12.161 Kaschin-Beck disease, right knee +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 O9A.1 Malignant neoplasm complicating pregnancy, childbirth and the puerperium +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 2 C71.8 Malignant neoplasm of overlapping sites of brain +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 3 E10.339 Type 1 diabetes mellitus with moderate nonproliferative diabetic retinopathy without macular edema +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 1 C75.1 Malignant neoplasm of pituitary gland +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 F25.0 Schizoaffective disorder, bipolar type +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 M11.071 Hydroxyapatite deposition disease, right ankle and foot +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 2 H26.223 Cataract secondary to ocular disorders (degenerative) (inflammatory), bilateral +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 3 D14 Benign neoplasm of middle ear and respiratory system +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 4 F52.0 Hypoactive sexual desire disorder +FFCDECD6-4048-4DCB-B910-1218160005B3 1 F01.5 Vascular dementia +FFCDECD6-4048-4DCB-B910-1218160005B3 2 C91.42 Hairy cell leukemia, in relapse +FFCDECD6-4048-4DCB-B910-1218160005B3 3 C21.8 Malignant neoplasm of overlapping sites of rectum, anus and anal canal +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 1 G47 Sleep disorders +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 2 M10.38 Gout due to renal impairment, vertebrae +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 3 F34.0 Cyclothymic disorder +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 4 B73.1 Onchocerciasis without eye disease +A50BE9B4-8A0B-4169-B894-F7BD86D7D90B 1 G96.1 Disorders of meninges, not elsewhere classified +69CC25ED-A54A-4BAF-97E3-774BB3C9DED1 1 C91.5 Adult T-cell lymphoma/leukemia (HTLV-1-associated) +69CC25ED-A54A-4BAF-97E3-774BB3C9DED1 2 H36 Retinal disorders in diseases classified elsewhere +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 1 Z91.15 Patient's noncompliance with renal dialysis +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 2 M05.5 Rheumatoid polyneuropathy with rheumatoid arthritis +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 3 D15.0 Benign neoplasm of thymus +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 4 C94.0 Acute erythroid leukemia +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 5 I25.75 Atherosclerosis of native coronary artery of transplanted heart with angina pectoris +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 1 C92.12 Chronic myeloid leukemia, BCR/ABL-positive, in relapse +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 2 Z13.22 Encounter for screening for metabolic disorder +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 3 Q60.0 Renal agenesis, unilateral +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 4 O26.6 Liver and biliary tract disorders in pregnancy, childbirth and the puerperium +967987B9-FFEF-4776-85CF-AE05CA81F583 1 M05.742 Rheumatoid arthritis with rheumatoid factor of left hand without organ or systems involvement +967987B9-FFEF-4776-85CF-AE05CA81F583 2 B95.1 Streptococcus, group B, as the cause of diseases classified elsewhere +967987B9-FFEF-4776-85CF-AE05CA81F583 3 G30 Alzheimer's disease +967987B9-FFEF-4776-85CF-AE05CA81F583 4 M90.511 Osteonecrosis in diseases classified elsewhere, right shoulder +967987B9-FFEF-4776-85CF-AE05CA81F583 5 H30.812 Harada's disease, left eye +9BBF3A51-443D-438B-9289-B98B8E0577C0 1 J66.1 Flax-dressers' disease +9BBF3A51-443D-438B-9289-B98B8E0577C0 2 E11.32 Type 2 diabetes mellitus with mild nonproliferative diabetic retinopathy +6D8008ED-D623-4BE4-B93B-335F9797C170 1 N18.1 Chronic kidney disease, stage 1 +6D8008ED-D623-4BE4-B93B-335F9797C170 2 C10.2 Malignant neoplasm of lateral wall of oropharynx +6D8008ED-D623-4BE4-B93B-335F9797C170 3 D41.4 Neoplasm of uncertain behavior of bladder +B3892204-880B-40EF-B3BB-B824B50E99E5 1 C88.3 Immunoproliferative small intestinal disease +B3892204-880B-40EF-B3BB-B824B50E99E5 2 C49.8 Malignant neoplasm of overlapping sites of connective and soft tissue +B3892204-880B-40EF-B3BB-B824B50E99E5 3 E09.41 Drug or chemical induced diabetes mellitus with neurological complications with diabetic mononeuropathy +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 1 Z12 Encounter for screening for malignant neoplasms +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 2 H47.53 Disorders of visual pathways in (due to) vascular disorders +7548B6CF-79D9-461D-A0C5-20B861406FAC 1 M05.261 Rheumatoid vasculitis with rheumatoid arthritis of right knee +7548B6CF-79D9-461D-A0C5-20B861406FAC 2 E75.01 Sandhoff disease +7548B6CF-79D9-461D-A0C5-20B861406FAC 3 M05.511 Rheumatoid polyneuropathy with rheumatoid arthritis of right shoulder +7548B6CF-79D9-461D-A0C5-20B861406FAC 4 C02.1 Malignant neoplasm of border of tongue +B5D31F01-7273-4901-B56F-8139769A11EF 1 B40.1 Chronic pulmonary blastomycosis +B5D31F01-7273-4901-B56F-8139769A11EF 2 E09.649 Drug or chemical induced diabetes mellitus with hypoglycemia without coma +B5D31F01-7273-4901-B56F-8139769A11EF 3 E11.5 Type 2 diabetes mellitus with circulatory complications +80D356B4-F974-441F-A5F2-F95986D119A2 1 H34 Retinal vascular occlusions +80D356B4-F974-441F-A5F2-F95986D119A2 2 K50.014 Crohn's disease of small intestine with abscess +80D356B4-F974-441F-A5F2-F95986D119A2 3 D68.3 Hemorrhagic disorder due to circulating anticoagulants +80D356B4-F974-441F-A5F2-F95986D119A2 4 J66.1 Flax-dressers' disease +80D356B4-F974-441F-A5F2-F95986D119A2 5 C31.3 Malignant neoplasm of sphenoid sinus +80D356B4-F974-441F-A5F2-F95986D119A2 6 M05.561 Rheumatoid polyneuropathy with rheumatoid arthritis of right knee +80D356B4-F974-441F-A5F2-F95986D119A2 7 Q61.01 Congenital single renal cyst +A0A976C8-9B30-4492-B8C4-5B25095B9192 1 M24.251 Disorder of ligament, right hip +A0A976C8-9B30-4492-B8C4-5B25095B9192 2 T46.0X5 Adverse effect of cardiac-stimulant glycosides and drugs of similar action +A0A976C8-9B30-4492-B8C4-5B25095B9192 3 F33.1 Major depressive disorder, recurrent, moderate +A0A976C8-9B30-4492-B8C4-5B25095B9192 4 M90 Osteopathies in diseases classified elsewhere +A0A976C8-9B30-4492-B8C4-5B25095B9192 5 K57.5 Diverticular disease of both small and large intestine without perforation or abscess +A0A976C8-9B30-4492-B8C4-5B25095B9192 6 H43 Disorders of vitreous body +A0A976C8-9B30-4492-B8C4-5B25095B9192 7 F31.6 Bipolar disorder, current episode mixed +016A590E-D093-4667-A5DA-D68EA6987D93 1 O99.712 Diseases of the skin and subcutaneous tissue complicating pregnancy, second trimester +016A590E-D093-4667-A5DA-D68EA6987D93 2 E11.64 Type 2 diabetes mellitus with hypoglycemia +016A590E-D093-4667-A5DA-D68EA6987D93 3 I25.812 Atherosclerosis of bypass graft of coronary artery of transplanted heart without angina pectoris +016A590E-D093-4667-A5DA-D68EA6987D93 4 O24.1 Pre-existing diabetes mellitus, type 2, in pregnancy, childbirth and the puerperium +016A590E-D093-4667-A5DA-D68EA6987D93 5 F13.151 Sedative, hypnotic or anxiolytic abuse with sedative, hypnotic or anxiolytic-induced psychotic disorder with hallucinations +3B11D6B3-A36A-4B69-A437-C29BF425A941 1 I79.0 Aneurysm of aorta in diseases classified elsewhere +3B11D6B3-A36A-4B69-A437-C29BF425A941 2 T82.4 Mechanical complication of vascular dialysis catheter +3B11D6B3-A36A-4B69-A437-C29BF425A941 3 D12.1 Benign neoplasm of appendix +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 1 A98.3 Marburg virus disease +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 2 F14.180 Cocaine abuse with cocaine-induced anxiety disorder +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 3 M05.252 Rheumatoid vasculitis with rheumatoid arthritis of left hip +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 4 M06.051 Rheumatoid arthritis without rheumatoid factor, right hip +B2EB15FA-5431-4804-9309-4215BDC778C0 1 M05.722 Rheumatoid arthritis with rheumatoid factor of left elbow without organ or systems involvement +B2EB15FA-5431-4804-9309-4215BDC778C0 2 H75.03 Mastoiditis in infectious and parasitic diseases classified elsewhere, bilateral +B2EB15FA-5431-4804-9309-4215BDC778C0 3 C91.1 Chronic lymphocytic leukemia of B-cell type +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 1 H16.433 Localized vascularization of cornea, bilateral +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 2 Q60.4 Renal hypoplasia, bilateral +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 3 O9A.53 Psychological abuse complicating the puerperium +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 4 I25.711 Atherosclerosis of autologous vein coronary artery bypass graft(s) with angina pectoris with documented spasm +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 5 E10.630 Type 1 diabetes mellitus with periodontal disease +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 6 H42 Glaucoma in diseases classified elsewhere +C5D09468-574F-4802-B56F-DB38F4EB1687 1 N25.1 Nephrogenic diabetes insipidus +C5D09468-574F-4802-B56F-DB38F4EB1687 2 H61.192 Noninfective disorders of pinna, left ear +C5D09468-574F-4802-B56F-DB38F4EB1687 3 O99.611 Diseases of the digestive system complicating pregnancy, first trimester +C5D09468-574F-4802-B56F-DB38F4EB1687 4 H47.0 Disorders of optic nerve, not elsewhere classified +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 1 M02.37 Reiter's disease, ankle and foot +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 2 O99.411 Diseases of the circulatory system complicating pregnancy, first trimester +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 3 D39.11 Neoplasm of uncertain behavior of right ovary +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 4 E08.641 Diabetes mellitus due to underlying condition with hypoglycemia with coma +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 1 M10.31 Gout due to renal impairment, shoulder +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 2 D48.4 Neoplasm of uncertain behavior of peritoneum +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 3 M11.05 Hydroxyapatite deposition disease, hip +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 1 I25.110 Atherosclerotic heart disease of native coronary artery with unstable angina pectoris +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 2 M63.851 Disorders of muscle in diseases classified elsewhere, right thigh +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 1 E72.4 Disorders of ornithine metabolism +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 2 C34.2 Malignant neoplasm of middle lobe, bronchus or lung +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 3 H16.433 Localized vascularization of cornea, bilateral +3E462A8F-7B90-43A1-A8B6-AD82CB5002C9 1 O24.111 Pre-existing diabetes mellitus, type 2, in pregnancy, first trimester +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 1 Z13.0 Encounter for screening for diseases of the blood and blood-forming organs and certain disorders involving the immune mechanism +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 2 M90.6 Osteitis deformans in neoplastic diseases +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 3 I79.0 Aneurysm of aorta in diseases classified elsewhere +A7142B71-A144-4D56-BD14-3E966B01DB37 1 M24.22 Disorder of ligament, elbow +A7142B71-A144-4D56-BD14-3E966B01DB37 2 O99.43 Diseases of the circulatory system complicating the puerperium +A7142B71-A144-4D56-BD14-3E966B01DB37 3 M05.132 Rheumatoid lung disease with rheumatoid arthritis of left wrist +A7142B71-A144-4D56-BD14-3E966B01DB37 4 E11.331 Type 2 diabetes mellitus with moderate nonproliferative diabetic retinopathy with macular edema +A7142B71-A144-4D56-BD14-3E966B01DB37 5 E10.331 Type 1 diabetes mellitus with moderate nonproliferative diabetic retinopathy with macular edema +FE0B9B59-1927-45B7-8556-E079DC1DE30A 1 C03.0 Malignant neoplasm of upper gum +FE0B9B59-1927-45B7-8556-E079DC1DE30A 2 K76.7 Hepatorenal syndrome +FE0B9B59-1927-45B7-8556-E079DC1DE30A 3 C75.3 Malignant neoplasm of pineal gland +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 1 Z12.2 Encounter for screening for malignant neoplasm of respiratory organs +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 2 I08.1 Rheumatic disorders of both mitral and tricuspid valves +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 3 F52.3 Orgasmic disorder +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 4 C94.32 Mast cell leukemia, in relapse +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 5 M06.2 Rheumatoid bursitis +1A220558-5996-43E1-AE5D-7B96180FED35 1 C69.61 Malignant neoplasm of right orbit +1A220558-5996-43E1-AE5D-7B96180FED35 2 I08.1 Rheumatic disorders of both mitral and tricuspid valves +1A220558-5996-43E1-AE5D-7B96180FED35 3 Q24.3 Pulmonary infundibular stenosis +7A7332AD-88B1-4848-9356-E5260E477C59 1 O10.213 Pre-existing hypertensive chronic kidney disease complicating pregnancy, third trimester +7A7332AD-88B1-4848-9356-E5260E477C59 2 O98.63 Protozoal diseases complicating the puerperium +7A7332AD-88B1-4848-9356-E5260E477C59 3 E09.621 Drug or chemical induced diabetes mellitus with foot ulcer +7A7332AD-88B1-4848-9356-E5260E477C59 4 K57.5 Diverticular disease of both small and large intestine without perforation or abscess +7A7332AD-88B1-4848-9356-E5260E477C59 5 C91.0 Acute lymphoblastic leukemia [ALL] +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 1 M90.51 Osteonecrosis in diseases classified elsewhere, shoulder +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 2 E08.32 Diabetes mellitus due to underlying condition with mild nonproliferative diabetic retinopathy +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 3 M49.84 Spondylopathy in diseases classified elsewhere, thoracic region +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 4 D48.2 Neoplasm of uncertain behavior of peripheral nerves and autonomic nervous system +36E2F89E-777A-4D77-9D95-0D70A8AB416F 1 F63.81 Intermittent explosive disorder +36E2F89E-777A-4D77-9D95-0D70A8AB416F 2 O9A.5 Psychological abuse complicating pregnancy, childbirth and the puerperium +36E2F89E-777A-4D77-9D95-0D70A8AB416F 3 S37.812 Contusion of adrenal gland +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 1 O10.13 Pre-existing hypertensive heart disease complicating the puerperium +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 2 O99.43 Diseases of the circulatory system complicating the puerperium +03A481F5-B32A-4A91-BD42-43EB78FEBA77 1 C94.22 Acute megakaryoblastic leukemia, in relapse +03A481F5-B32A-4A91-BD42-43EB78FEBA77 2 A48.2 Nonpneumonic Legionnaires' disease [Pontiac fever] +2A5251B1-0945-47FA-A65C-7A6381562591 1 C11 Malignant neoplasm of nasopharynx +2A5251B1-0945-47FA-A65C-7A6381562591 2 F16.151 Hallucinogen abuse with hallucinogen-induced psychotic disorder with hallucinations +2A5251B1-0945-47FA-A65C-7A6381562591 3 M05.23 Rheumatoid vasculitis with rheumatoid arthritis of wrist +2A5251B1-0945-47FA-A65C-7A6381562591 4 M84 Disorder of continuity of bone +2A5251B1-0945-47FA-A65C-7A6381562591 5 K50.01 Crohn's disease of small intestine with complications +2A5251B1-0945-47FA-A65C-7A6381562591 6 F95.1 Chronic motor or vocal tic disorder +8AF47463-8534-4203-B210-C2290F6CE689 1 I43 Cardiomyopathy in diseases classified elsewhere +8AF47463-8534-4203-B210-C2290F6CE689 2 M90.522 Osteonecrosis in diseases classified elsewhere, left upper arm +8AF47463-8534-4203-B210-C2290F6CE689 3 F14.15 Cocaine abuse with cocaine-induced psychotic disorder +8AF47463-8534-4203-B210-C2290F6CE689 4 O24.013 Pre-existing diabetes mellitus, type 1, in pregnancy, third trimester +8AF47463-8534-4203-B210-C2290F6CE689 5 D55.2 Anemia due to disorders of glycolytic enzymes +135C831F-7DA5-46C0-959C-EBCBD8810B43 1 E09.359 Drug or chemical induced diabetes mellitus with proliferative diabetic retinopathy without macular edema +135C831F-7DA5-46C0-959C-EBCBD8810B43 2 M49.87 Spondylopathy in diseases classified elsewhere, lumbosacral region +135C831F-7DA5-46C0-959C-EBCBD8810B43 3 I25.10 Atherosclerotic heart disease of native coronary artery without angina pectoris +135C831F-7DA5-46C0-959C-EBCBD8810B43 4 M90.632 Osteitis deformans in neoplastic diseases, left forearm +135C831F-7DA5-46C0-959C-EBCBD8810B43 5 M05.17 Rheumatoid lung disease with rheumatoid arthritis of ankle and foot +8856096E-E59C-4156-A767-C091AF799C80 1 M90.6 Osteitis deformans in neoplastic diseases +6623F5D6-D581-4268-9F9B-21612FBBF7B5 1 C72.1 Malignant neoplasm of cauda equina +6623F5D6-D581-4268-9F9B-21612FBBF7B5 2 K71.50 Toxic liver disease with chronic active hepatitis without ascites +6623F5D6-D581-4268-9F9B-21612FBBF7B5 3 Z12.71 Encounter for screening for malignant neoplasm of testis +6623F5D6-D581-4268-9F9B-21612FBBF7B5 4 M02.352 Reiter's disease, left hip +6623F5D6-D581-4268-9F9B-21612FBBF7B5 5 C94.32 Mast cell leukemia, in relapse +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 1 F12.180 Cannabis abuse with cannabis-induced anxiety disorder +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 2 S35.415 Laceration of left renal vein +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 3 K08.422 Partial loss of teeth due to periodontal diseases, class II +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 4 O10.11 Pre-existing hypertensive heart disease complicating pregnancy +FB909FAE-72DD-4F6F-9828-D92183DF185F 1 C18.3 Malignant neoplasm of hepatic flexure +FB909FAE-72DD-4F6F-9828-D92183DF185F 2 O24.42 Gestational diabetes mellitus in childbirth +FB909FAE-72DD-4F6F-9828-D92183DF185F 3 C62.0 Malignant neoplasm of undescended testis +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 1 M05.272 Rheumatoid vasculitis with rheumatoid arthritis of left ankle and foot +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 2 D44.6 Neoplasm of uncertain behavior of carotid body +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 3 C18.7 Malignant neoplasm of sigmoid colon +64182B95-EB72-4E2B-BE77-8050B71498CE 1 E10.32 Type 1 diabetes mellitus with mild nonproliferative diabetic retinopathy +64182B95-EB72-4E2B-BE77-8050B71498CE 2 F45.4 Pain disorders related to psychological factors +64182B95-EB72-4E2B-BE77-8050B71498CE 3 C74.11 Malignant neoplasm of medulla of right adrenal gland +64182B95-EB72-4E2B-BE77-8050B71498CE 4 E08.51 Diabetes mellitus due to underlying condition with diabetic peripheral angiopathy without gangrene +64182B95-EB72-4E2B-BE77-8050B71498CE 5 G32.0 Subacute combined degeneration of spinal cord in diseases classified elsewhere +DB22A4D9-7E4D-485C-916A-9CD1386507FB 1 M06.361 Rheumatoid nodule, right knee +DB22A4D9-7E4D-485C-916A-9CD1386507FB 2 E09.351 Drug or chemical induced diabetes mellitus with proliferative diabetic retinopathy with macular edema +DB22A4D9-7E4D-485C-916A-9CD1386507FB 3 F18.150 Inhalant abuse with inhalant-induced psychotic disorder with delusions +DB22A4D9-7E4D-485C-916A-9CD1386507FB 4 E09.62 Drug or chemical induced diabetes mellitus with skin complications +6E70D84D-C75F-477C-BC37-9177C3698C66 1 H26.21 Cataract with neovascularization +6E70D84D-C75F-477C-BC37-9177C3698C66 2 D13.4 Benign neoplasm of liver +6E70D84D-C75F-477C-BC37-9177C3698C66 3 E08.0 Diabetes mellitus due to underlying condition with hyperosmolarity +6E70D84D-C75F-477C-BC37-9177C3698C66 4 H81.02 Ménière's disease, left ear +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 1 Z12.13 Encounter for screening for malignant neoplasm of small intestine +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 2 Z95.810 Presence of automatic (implantable) cardiac defibrillator +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 3 M06.37 Rheumatoid nodule, ankle and foot +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 4 K50.813 Crohn's disease of both small and large intestine with fistula +7FD13988-E58A-4A5C-8680-89AC200950FA 1 D35.5 Benign neoplasm of carotid body +7FD13988-E58A-4A5C-8680-89AC200950FA 2 C63.2 Malignant neoplasm of scrotum +7FD13988-E58A-4A5C-8680-89AC200950FA 3 M06.25 Rheumatoid bursitis, hip +7FD13988-E58A-4A5C-8680-89AC200950FA 4 D44.5 Neoplasm of uncertain behavior of pineal gland +C60FE675-CA52-4C55-A233-F4B27E94987F 1 D16.2 Benign neoplasm of long bones of lower limb +C60FE675-CA52-4C55-A233-F4B27E94987F 2 E11.3 Type 2 diabetes mellitus with ophthalmic complications +C60FE675-CA52-4C55-A233-F4B27E94987F 3 M90.86 Osteopathy in diseases classified elsewhere, lower leg +C60FE675-CA52-4C55-A233-F4B27E94987F 4 A83.6 Rocio virus disease +B39DC5AC-E003-4E6A-91B6-FC07625A1285 1 M06.041 Rheumatoid arthritis without rheumatoid factor, right hand +B39DC5AC-E003-4E6A-91B6-FC07625A1285 2 C93.01 Acute monoblastic/monocytic leukemia, in remission +B39DC5AC-E003-4E6A-91B6-FC07625A1285 3 M1A.352 Chronic gout due to renal impairment, left hip +B39DC5AC-E003-4E6A-91B6-FC07625A1285 4 F11 Opioid related disorders +B39DC5AC-E003-4E6A-91B6-FC07625A1285 5 M05.441 Rheumatoid myopathy with rheumatoid arthritis of right hand +FA157FA5-F488-4884-BF87-E144630D595C 1 M05.732 Rheumatoid arthritis with rheumatoid factor of left wrist without organ or systems involvement +FA157FA5-F488-4884-BF87-E144630D595C 2 M06.34 Rheumatoid nodule, hand +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 3 M05.741 Rheumatoid arthritis with rheumatoid factor of right hand without organ or systems involvement +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 4 F94.2 Disinhibited attachment disorder of childhood +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 5 C47 Malignant neoplasm of peripheral nerves and autonomic nervous system +868E700E-3C56-458F-A477-078D671DCB20 1 M10.37 Gout due to renal impairment, ankle and foot +868E700E-3C56-458F-A477-078D671DCB20 2 B33.4 Hantavirus (cardio)-pulmonary syndrome [HPS] [HCPS] +56A35E74-90BE-44A0-B7BA-7743BB152133 1 C67.5 Malignant neoplasm of bladder neck +56A35E74-90BE-44A0-B7BA-7743BB152133 2 C76.51 Malignant neoplasm of right lower limb +56A35E74-90BE-44A0-B7BA-7743BB152133 3 K50.1 Crohn's disease of large intestine +CC12B481-B516-455B-884F-4CA900B29F2E 1 M10.361 Gout due to renal impairment, right knee +CC12B481-B516-455B-884F-4CA900B29F2E 2 E87.4 Mixed disorder of acid-base balance +CC12B481-B516-455B-884F-4CA900B29F2E 3 D89.810 Acute graft-versus-host disease +714823AF-C52C-414C-B53B-C43EACD194C3 1 K08.121 Complete loss of teeth due to periodontal diseases, class I +714823AF-C52C-414C-B53B-C43EACD194C3 2 O26.63 Liver and biliary tract disorders in the puerperium +714823AF-C52C-414C-B53B-C43EACD194C3 3 O9A.513 Psychological abuse complicating pregnancy, third trimester +3231F930-2978-4F50-8234-755449851E7B 1 E30 Disorders of puberty, not elsewhere classified +3231F930-2978-4F50-8234-755449851E7B 2 Z49 Encounter for care involving renal dialysis +3231F930-2978-4F50-8234-755449851E7B 3 F18.17 Inhalant abuse with inhalant-induced dementia +3231F930-2978-4F50-8234-755449851E7B 4 J84.842 Pulmonary interstitial glycogenosis +3231F930-2978-4F50-8234-755449851E7B 5 F94.1 Reactive attachment disorder of childhood +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 1 G71 Primary disorders of muscles +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 2 O46.023 Antepartum hemorrhage with disseminated intravascular coagulation, third trimester +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 1 C18.3 Malignant neoplasm of hepatic flexure +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 2 C79.51 Secondary malignant neoplasm of bone +21792512-2D40-4326-BEA2-A40127EB24FF 1 O99.351 Diseases of the nervous system complicating pregnancy, first trimester +21792512-2D40-4326-BEA2-A40127EB24FF 2 C16.2 Malignant neoplasm of body of stomach +21792512-2D40-4326-BEA2-A40127EB24FF 3 M90.642 Osteitis deformans in neoplastic diseases, left hand +21792512-2D40-4326-BEA2-A40127EB24FF 4 M01.X72 Direct infection of left ankle and foot in infectious and parasitic diseases classified elsewhere +21792512-2D40-4326-BEA2-A40127EB24FF 5 E30 Disorders of puberty, not elsewhere classified +21792512-2D40-4326-BEA2-A40127EB24FF 6 M10.322 Gout due to renal impairment, left elbow +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 1 M05.25 Rheumatoid vasculitis with rheumatoid arthritis of hip +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 2 M05.59 Rheumatoid polyneuropathy with rheumatoid arthritis of multiple sites +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 3 O98.6 Protozoal diseases complicating pregnancy, childbirth and the puerperium +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 4 D37.0 Neoplasm of uncertain behavior of lip, oral cavity and pharynx +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 1 C57.21 Malignant neoplasm of right round ligament +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 2 T46.3X6 Underdosing of coronary vasodilators +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 3 D31.41 Benign neoplasm of right ciliary body +36775002-9EC3-4889-AD4F-80DC6855C8D8 1 K00 Disorders of tooth development and eruption +36775002-9EC3-4889-AD4F-80DC6855C8D8 2 M24.242 Disorder of ligament, left hand +36775002-9EC3-4889-AD4F-80DC6855C8D8 3 C79.02 Secondary malignant neoplasm of left kidney and renal pelvis +36775002-9EC3-4889-AD4F-80DC6855C8D8 4 E71.31 Disorders of fatty-acid oxidation +36775002-9EC3-4889-AD4F-80DC6855C8D8 5 M24.272 Disorder of ligament, left ankle +36775002-9EC3-4889-AD4F-80DC6855C8D8 6 E08.5 Diabetes mellitus due to underlying condition with circulatory complications +4C201C71-CCED-40D1-9642-F9C8C485B854 1 M63.832 Disorders of muscle in diseases classified elsewhere, left forearm +4C201C71-CCED-40D1-9642-F9C8C485B854 2 T43.3X5 Adverse effect of phenothiazine antipsychotics and neuroleptics +4C201C71-CCED-40D1-9642-F9C8C485B854 3 D12.9 Benign neoplasm of anus and anal canal +4C201C71-CCED-40D1-9642-F9C8C485B854 4 D31.41 Benign neoplasm of right ciliary body +4C201C71-CCED-40D1-9642-F9C8C485B854 5 M01.X1 Direct infection of shoulder joint in infectious and parasitic diseases classified elsewhere +4C201C71-CCED-40D1-9642-F9C8C485B854 6 Z22.31 Carrier of bacterial disease due to meningococci +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 1 C72.3 Malignant neoplasm of optic nerve +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 2 M05.13 Rheumatoid lung disease with rheumatoid arthritis of wrist +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 3 H15 Disorders of sclera +C65A4ADE-112E-49E4-B72A-0DED22C242ED 1 M05.27 Rheumatoid vasculitis with rheumatoid arthritis of ankle and foot +C65A4ADE-112E-49E4-B72A-0DED22C242ED 2 N16 Renal tubulo-interstitial disorders in diseases classified elsewhere +C65A4ADE-112E-49E4-B72A-0DED22C242ED 3 D35.2 Benign neoplasm of pituitary gland +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 1 F06.1 Catatonic disorder due to known physiological condition diff --git a/uml2es/examples/patient-hub/datasets/labs-core/LabsCorePopulatedTable.txt b/uml2es/examples/patient-hub/datasets/labs-core/LabsCorePopulatedTable.txt new file mode 100755 index 0000000..5549eb2 --- /dev/null +++ b/uml2es/examples/patient-hub/datasets/labs-core/LabsCorePopulatedTable.txt @@ -0,0 +1,807 @@ +PatientID AdmissionID LabName LabValue LabUnits LabDateTime +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 URINALYSIS: RED BLOOD CELLS 1.8 rbc/hpf 1992-07-01 01:36:17.910 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 METABOLIC: GLUCOSE 103.3 mg/dL 1992-06-30 09:35:52.383 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 CBC: MCH 35.8 pg 1992-06-30 03:50:11.777 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 METABOLIC: CALCIUM 8.9 mg/dL 1992-06-30 12:09:46.107 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 CBC: HEMATOCRIT 50.9 % 2005-07-26 09:51:14.723 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 METABOLIC: POTASSIUM 4.4 mmol/L 2005-07-26 14:03:53.497 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 CBC: NEUTROPHILS 3.1 k/cumm 2005-07-26 12:27:06.393 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 METABOLIC: CHLORIDE 113.4 mmol/L 2011-12-18 20:12:43.240 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 METABOLIC: ALK PHOS 64.9 U/L 2011-12-19 05:48:43.303 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 1 CBC: HEMOGLOBIN 10.9 gm/dl 1953-11-28 14:09:29.363 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 2 CBC: NEUTROPHILS 4.4 k/cumm 1979-09-15 13:22:34.587 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 2 CBC: EOSINOPHILS 0.2 k/cumm 1979-09-16 02:04:55.270 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 4 METABOLIC: ALT/SGPT 43.5 U/L 2004-12-11 06:52:54.787 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 4 CBC: ABSOLUTE LYMPHOCYTES 28.8 % 2004-12-11 13:03:20.637 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 4 CBC: BASOPHILS 0.2 k/cumm 2004-12-11 02:15:35.400 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 5 CBC: RED BLOOD CELL COUNT 5.7 m/cumm 2006-04-01 16:35:22.893 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 5 CBC: HEMOGLOBIN 16.8 gm/dl 2006-04-01 08:47:35.620 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 URINALYSIS: WHITE BLOOD CELLS 3.7 wbc/hpf 2007-02-13 10:11:56.453 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 CBC: HEMOGLOBIN 15.9 gm/dl 2008-05-11 15:04:52.957 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 METABOLIC: ALBUMIN 3.6 gm/dL 2008-05-11 20:04:06.073 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2008-05-12 01:03:12.787 +220C8D43-1322-4A9D-B890-D426942A3649 1 CBC: RDW 12.4 % 1995-05-02 04:12:43.870 +220C8D43-1322-4A9D-B890-D426942A3649 1 CBC: MONOCYTES 0.7 k/cumm 1995-05-02 08:33:45.287 +220C8D43-1322-4A9D-B890-D426942A3649 2 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1997-09-23 17:38:16.057 +220C8D43-1322-4A9D-B890-D426942A3649 3 CBC: PLATELET COUNT 406.6 k/cumm 2000-09-26 14:26:48.843 +220C8D43-1322-4A9D-B890-D426942A3649 3 METABOLIC: ALBUMIN 5.4 gm/dL 2000-09-26 01:06:53.050 +220C8D43-1322-4A9D-B890-D426942A3649 4 METABOLIC: ALT/SGPT 75 U/L 2011-01-29 03:32:11.393 +220C8D43-1322-4A9D-B890-D426942A3649 4 METABOLIC: CHLORIDE 93.6 mmol/L 2011-01-29 09:42:03.317 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 METABOLIC: ANION GAP 15.4 mmol/L 1987-10-09 10:01:48.483 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 METABOLIC: ALK PHOS 127.9 U/L 1987-10-10 06:05:43.107 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 2 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2005-06-17 15:55:38.773 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 3 CBC: MONOCYTES 0.7 k/cumm 2010-02-26 06:16:44.383 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 3 METABOLIC: ALBUMIN 3.8 gm/dL 2010-02-26 09:23:29.080 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 1 METABOLIC: CREATININE 1.2 mg/dL 1941-11-09 21:25:24.643 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 1 URINALYSIS: RED BLOOD CELLS 2.8 rbc/hpf 1941-11-09 17:59:30.320 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 CBC: LYMPHOCYTES 2.7 k/cumm 2008-05-24 21:50:02.233 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 METABOLIC: CARBON DIOXIDE 35.3 mmol/L 1974-01-26 07:58:50.130 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 METABOLIC: GLUCOSE 84 mg/dL 1974-01-26 05:54:45.660 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 2 URINALYSIS: RED BLOOD CELLS 0.4 rbc/hpf 1991-05-09 06:31:41.303 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 2 CBC: NEUTROPHILS 7 k/cumm 1991-05-09 05:59:27.863 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 3 URINALYSIS: PH 7.3 no unit 2003-12-24 05:42:35.800 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 3 METABOLIC: SODIUM 145.2 mmol/L 2003-12-24 05:25:36.937 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 4 URINALYSIS: PH 6.1 no unit 2010-01-09 06:26:10.700 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 4 CBC: NEUTROPHILS 1.6 k/cumm 2010-01-09 10:59:53.737 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 2 URINALYSIS: PH 6.1 no unit 2005-06-22 03:57:01.080 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 2 METABOLIC: BILI TOTAL 0.1 mg/dL 2005-06-21 16:01:33.837 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 3 CBC: WHITE BLOOD CELL COUNT 9 k/cumm 2010-02-26 13:27:23.283 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 3 METABOLIC: TOTAL PROTEIN 9.8 gm/dL 2010-02-26 12:10:25.737 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 1 METABOLIC: CHLORIDE 111.2 mmol/L 1941-11-12 06:21:58.223 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 1 CBC: ABSOLUTE LYMPHOCYTES 17.1 % 1941-11-11 11:18:18.497 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 CBC: RED BLOOD CELL COUNT 6.3 m/cumm 2008-05-21 18:13:53.287 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 3 CBC: ABSOLUTE LYMPHOCYTES 19.7 % 2003-12-21 11:25:50.180 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 3 CBC: WHITE BLOOD CELL COUNT 5.8 k/cumm 2003-12-21 06:59:28.090 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2008-05-27 17:43:01.947 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 CBC: MCH 24.6 pg 2008-05-27 22:38:58.343 +220C8D43-1322-4A9D-B890-D426942A3649 1 METABOLIC: ANION GAP 8.4 mmol/L 1995-05-03 19:30:58.887 +220C8D43-1322-4A9D-B890-D426942A3649 2 METABOLIC: GLUCOSE 81.5 mg/dL 1997-09-21 20:24:16.100 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 METABOLIC: CALCIUM 12 mg/dL 2008-06-02 22:56:54.503 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE 2 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2008-06-02 09:16:32.930 +220C8D43-1322-4A9D-B890-D426942A3649 2 CBC: MCHC 33.1 g/dl 1997-10-02 17:11:41.623 +220C8D43-1322-4A9D-B890-D426942A3649 2 CBC: MCH 30.1 pg 1997-10-04 06:48:11.313 +220C8D43-1322-4A9D-B890-D426942A3649 3 METABOLIC: CALCIUM 11.3 mg/dL 2000-09-23 19:31:27.967 +220C8D43-1322-4A9D-B890-D426942A3649 3 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2000-09-24 06:50:54.493.923 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 METABOLIC: BUN 27.2 mg/dL 1974-01-23 06:44:11.497 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 METABOLIC: CALCIUM 9.8 mg/dL 1974-01-22 20:19:10.153 +220C8D43-1322-4A9D-B890-D426942A3649 3 METABOLIC: ALT/SGPT 28 U/L 2000-09-30 00:12:36.800 +220C8D43-1322-4A9D-B890-D426942A3649 3 METABOLIC: CHLORIDE 104.5 mmol/L 2000-09-30 08:24:34.027 +220C8D43-1322-4A9D-B890-D426942A3649 4 METABOLIC: CARBON DIOXIDE 24.8 mmol/L 2011-01-26 02:47:44.050 +220C8D43-1322-4A9D-B890-D426942A3649 4 CBC: PLATELET COUNT 139.5 k/cumm 2011-01-26 20:09:07.140 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 3 METABOLIC: GLUCOSE 65 mg/dL 1994-08-24 01:34:15.063 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 3 METABOLIC: CARBON DIOXIDE 30.4 mmol/L 1994-08-24 01:47:13.697 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 4 METABOLIC: SODIUM 150.2 mmol/L 2004-12-11 10:49:58.273 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 4 METABOLIC: ANION GAP 10.2 mmol/L 2004-12-11 03:00:29.790 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 5 METABOLIC: ANION GAP 10.4 mmol/L 2006-03-31 10:12:32.383 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 5 METABOLIC: SODIUM 145.3 mmol/L 2006-03-31 16:34:14.793 +220C8D43-1322-4A9D-B890-D426942A3649 4 CBC: RED BLOOD CELL COUNT 3.2 m/cumm 2011-01-29 11:24:29.117 +220C8D43-1322-4A9D-B890-D426942A3649 4 METABOLIC: SODIUM 147.9 mmol/L 2011-01-30 03:40:51.003:27:04.307 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 CBC: MCHC 36.9 g/dl 2007-02-10 02:31:49.447 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 METABOLIC: CREATININE 1 mg/dL 2007-02-10 03:32:21.220 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 URINALYSIS: PH 6.9 no unit 1987-10-06 17:02:22.990 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1987-10-07 10:21:00.990 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 METABOLIC: ALK PHOS 94.7 U/L 2007-02-15 14:59:36.840 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 METABOLIC: POTASSIUM 4.5 mmol/L 2007-02-15 06:56:30.017 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 CBC: ABSOLUTE NEUTROPHILS 74.7 % 1974-01-26 01:37:53.823 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 1 CBC: WHITE BLOOD CELL COUNT 11.3 k/cumm 1974-01-25 12:08:58.307 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 METABOLIC: POTASSIUM 3.8 mmol/L 2007-02-27 02:12:04.390 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 6 CBC: HEMATOCRIT 39.7 % 2007-02-26 19:12:50.320 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 CBC: RED BLOOD CELL COUNT 6.7 m/cumm 2008-05-11 10:52:56.600 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 URINALYSIS: WHITE BLOOD CELLS 2.5 wbc/hpf 2008-05-11 21:36:23.397 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 CBC: EOSINOPHILS 0.4 k/cumm 2005-07-25 04:15:47.673 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 CBC: MEAN CORPUSCULAR VOLUME 84.5 fl 2005-07-25 06:07:59.980 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 CBC: MEAN CORPUSCULAR VOLUME 96.9 fl 1987-10-11 15:40:47.387 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 METABOLIC: CHLORIDE 106.3 mmol/L 1987-10-12 00:32:06.063 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 CBC: MCHC 29.6 g/dl 2005-07-28 02:43:35.280 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 2 CBC: PLATELET COUNT 393.7 k/cumm 2005-07-28 06:30:26.803 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 CBC: EOSINOPHILS 0.5 k/cumm 1992-06-27 11:13:30.327 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 1 METABOLIC: SODIUM 136 mmol/L 1992-06-27 18:10:18.340 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 URINALYSIS: PH 7.4 no unit 2008-05-15 08:16:39.923 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 7 CBC: LYMPHOCYTES 1.8 k/cumm 2008-05-15 01:22:56.367 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 METABOLIC: ALT/SGPT 65.4 U/L 2011-12-17 05:31:24.950 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 CBC: NEUTROPHILS 5.1 k/cumm 2011-12-16 13:39:22.420 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1987-10-18 18:07:14.500 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 1 URINALYSIS: PH 7.4 no unit 1987-10-19 13:03:15.520 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 2 CBC: RED BLOOD CELL COUNT 3.4 m/cumm 2005-06-16 13:12:43.697 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E 2 CBC: MCHC 32 g/dl 2005-06-16 10:22:25.500 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 METABOLIC: SODIUM 136.2 mmol/L 2011-12-21 06:27:58.017 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C 3 CBC: MCH 24.2 pg 2011-12-20 11:08:22.943 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 1 CBC: NEUTROPHILS 7.9 k/cumm 1953-11-25 01:24:10.267 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 1 CBC: MCHC 28.4 g/dl 1953-11-25 06:23:01.083 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 1 METABOLIC: CALCIUM 7 mg/dL 1953-11-25 11:37:34.827 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 2 METABOLIC: BUN 13.7 mg/dL 1979-09-12 21:33:01.130 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 2 METABOLIC: BILI TOTAL 0.7 mg/dL 1979-09-13 08:46:35.910 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE 2 METABOLIC: TOTAL PROTEIN 9.8 gm/dL 1979-09-12 13:41:35.370 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 4 URINALYSIS: WHITE BLOOD CELLS 0.8 wbc/hpf 2010-01-17 20:43:33.480 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C 4 METABOLIC: CALCIUM 7.6 mg/dL 2010-01-17 18:08:52.373 +FFCDECD6-4048-4DCB-B910-1218160005B3 1 CBC: RED BLOOD CELL COUNT 6.4 m/cumm 1968-07-05 21:59:47.540 +FFCDECD6-4048-4DCB-B910-1218160005B3 1 CBC: MCHC 36.7 g/dl 1968-07-06 01:11:54.550 +FFCDECD6-4048-4DCB-B910-1218160005B3 2 CBC: WHITE BLOOD CELL COUNT 4.8 k/cumm 1999-12-23 08:26:38.483 +FFCDECD6-4048-4DCB-B910-1218160005B3 2 METABOLIC: BILI TOTAL 0.8 mg/dL 1999-12-23 00:35:45.307 +FFCDECD6-4048-4DCB-B910-1218160005B3 3 URINALYSIS: WHITE BLOOD CELLS 3.8 wbc/hpf 2012-10-19 06:22:46.837 +FFCDECD6-4048-4DCB-B910-1218160005B3 3 METABOLIC: CREATININE 0.7 mg/dL 2012-10-19 04:51:02.487 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 1 METABOLIC: GLUCOSE 119.5 mg/dL 1988-12-02 16:58:28.483 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 1 CBC: MONOCYTES 0.9 k/cumm 1988-12-02 13:49:45.987 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 2 CBC: EOSINOPHILS 0.6 k/cumm 2006-10-11 01:48:24.123 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 2 CBC: MEAN CORPUSCULAR VOLUME 93.3 fl 2006-10-11 00:23:53.490 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 3 URINALYSIS: WHITE BLOOD CELLS 1.6 wbc/hpf 2006-12-26 06:28:27.990 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 3 METABOLIC: BILI TOTAL 0.2 mg/dL 2006-12-26 19:56:52.897 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 4 METABOLIC: ALK PHOS 100 U/L 2009-09-15 20:27:01.153 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F 4 METABOLIC: BUN 21.1 mg/dL 2009-09-15 06:33:42.780 +A50BE9B4-8A0B-4169-B894-F7BD86D7D90B 1 URINALYSIS: WHITE BLOOD CELLS 4.8 wbc/hpf 2010-10-26 01:02:09.087 +A50BE9B4-8A0B-4169-B894-F7BD86D7D90B 1 METABOLIC: ANION GAP 4.1 mmol/L 2010-10-25 15:06:56.810 +69CC25ED-A54A-4BAF-97E3-774BB3C9DED1 2 CBC: RED BLOOD CELL COUNT 5.5 m/cumm 2009-12-23 02:13:56.313 +69CC25ED-A54A-4BAF-97E3-774BB3C9DED1 2 METABOLIC: BUN 14.5 mg/dL 2009-12-23 16:05:20.223 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 1 METABOLIC: BUN 10 mg/dL 1976-02-25 01:04:48.233 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 1 CBC: NEUTROPHILS 9.3 k/cumm 1976-02-25 00:22:35.177 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 2 CBC: MCHC 34.3 g/dl 1977-01-07 01:25:16.997 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 2 URINALYSIS: WHITE BLOOD CELLS 5.5 wbc/hpf 1977-01-07 05:40:00.213 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 3 CBC: HEMOGLOBIN 12.4 gm/dl 1980-11-30 19:34:09.030 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 3 METABOLIC: ALBUMIN 5.7 gm/dL 1980-12-01 03:35:19.400 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 4 CBC: LYMPHOCYTES 1.8 k/cumm 1999-05-08 05:39:43.027 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 4 URINALYSIS: PH 5.3 no unit 1999-05-08 04:08:35.533 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 5 METABOLIC: ANION GAP 5.4 mmol/L 2009-09-29 04:00:20.623 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 5 URINALYSIS: RED BLOOD CELLS 2.7 rbc/hpf 2009-09-28 08:47:04.577 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 1 CBC: PLATELET COUNT 212.7 k/cumm 1988-06-21 05:50:32.733 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 1 URINALYSIS: WHITE BLOOD CELLS 3.7 wbc/hpf 1988-06-21 10:50:21.473 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 2 CBC: BASOPHILS 0.2 k/cumm 1988-11-10 14:12:25.740 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 2 CBC: MCH 25.8 pg 1988-11-10 18:58:17.093 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 3 CBC: RED BLOOD CELL COUNT 4.9 m/cumm 2002-12-09 16:23:50.080 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 3 METABOLIC: ANION GAP 16.5 mmol/L 2002-12-10 02:56:06.627 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 4 METABOLIC: CHLORIDE 110.2 mmol/L 2009-04-03 04:42:50.600 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 4 URINALYSIS: RED BLOOD CELLS 0.7 rbc/hpf 2009-04-03 04:07:27.283 +967987B9-FFEF-4776-85CF-AE05CA81F583 1 METABOLIC: GLUCOSE 116.3 mg/dL 1971-05-09 09:31:20.553 +967987B9-FFEF-4776-85CF-AE05CA81F583 1 CBC: RDW 14.3 % 1971-05-09 08:17:23.697 +967987B9-FFEF-4776-85CF-AE05CA81F583 2 METABOLIC: ALT/SGPT 51.1 U/L 1994-10-06 00:54:59.453 +967987B9-FFEF-4776-85CF-AE05CA81F583 2 METABOLIC: GLUCOSE 68.7 mg/dL 1994-10-06 04:01:59.330 +967987B9-FFEF-4776-85CF-AE05CA81F583 3 CBC: MEAN CORPUSCULAR VOLUME 70.7 fl 2004-01-09 10:08:28.017 +967987B9-FFEF-4776-85CF-AE05CA81F583 3 METABOLIC: ALBUMIN 5.5 gm/dL 2004-01-09 11:08:56.243 +967987B9-FFEF-4776-85CF-AE05CA81F583 4 CBC: MEAN CORPUSCULAR VOLUME 83 fl 2007-02-07 07:55:05.270 +967987B9-FFEF-4776-85CF-AE05CA81F583 4 CBC: BASOPHILS 0.1 k/cumm 2007-02-07 09:07:00.860 +967987B9-FFEF-4776-85CF-AE05CA81F583 5 CBC: MCH 22.9 pg 2009-12-31 22:11:24.437 +967987B9-FFEF-4776-85CF-AE05CA81F583 5 METABOLIC: AST/SGOT 28.7 U/L 2009-12-31 22:07:46.137 +9BBF3A51-443D-438B-9289-B98B8E0577C0 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1971-09-22 04:28:09.570 +9BBF3A51-443D-438B-9289-B98B8E0577C0 1 CBC: ABSOLUTE LYMPHOCYTES 32.4 % 1971-09-22 04:08:41.003 +9BBF3A51-443D-438B-9289-B98B8E0577C0 2 URINALYSIS: RED BLOOD CELLS 2.8 rbc/hpf 2009-10-18 09:39:00.993 +9BBF3A51-443D-438B-9289-B98B8E0577C0 2 METABOLIC: BUN 25.1 mg/dL 2009-10-18 18:16:13.570 +6D8008ED-D623-4BE4-B93B-335F9797C170 1 URINALYSIS: RED BLOOD CELLS 1.9 rbc/hpf 2001-05-25 00:54:45.923 +6D8008ED-D623-4BE4-B93B-335F9797C170 1 CBC: BASOPHILS 0.2 k/cumm 2001-05-25 05:06:51.590 +6D8008ED-D623-4BE4-B93B-335F9797C170 2 METABOLIC: GLUCOSE 116.4 mg/dL 2004-12-05 05:43:53.590 +6D8008ED-D623-4BE4-B93B-335F9797C170 2 URINALYSIS: RED BLOOD CELLS 1.2 rbc/hpf 2004-12-04 20:51:27.227 +6D8008ED-D623-4BE4-B93B-335F9797C170 3 CBC: ABSOLUTE LYMPHOCYTES 15.6 % 2012-01-20 09:47:10.827 +6D8008ED-D623-4BE4-B93B-335F9797C170 3 URINALYSIS: RED BLOOD CELLS 2.3 rbc/hpf 2012-01-20 08:27:47.853 +B3892204-880B-40EF-B3BB-B824B50E99E5 1 CBC: MCHC 30.8 g/dl 2000-08-18 23:02:10.513 +B3892204-880B-40EF-B3BB-B824B50E99E5 1 URINALYSIS: PH 6.2 no unit 2000-08-18 19:11:24.483 +B3892204-880B-40EF-B3BB-B824B50E99E5 2 CBC: ABSOLUTE NEUTROPHILS 60.6 % 2001-09-23 03:52:14.410 +B3892204-880B-40EF-B3BB-B824B50E99E5 2 CBC: WHITE BLOOD CELL COUNT 5.2 k/cumm 2001-09-23 13:04:30.527 +B3892204-880B-40EF-B3BB-B824B50E99E5 3 CBC: ABSOLUTE NEUTROPHILS 79.8 % 2012-02-24 13:24:34.070 +B3892204-880B-40EF-B3BB-B824B50E99E5 3 CBC: EOSINOPHILS 0.3 k/cumm 2012-02-25 00:21:11.240 +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 1 CBC: RED BLOOD CELL COUNT 4.1 m/cumm 1983-06-06 23:05:10.790 +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 1 CBC: PLATELET COUNT 370.9 k/cumm 1983-06-06 21:56:31.057 +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 2 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2011-04-11 07:30:09.767 +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 2 CBC: BASOPHILS 0.1 k/cumm 2011-04-11 10:21:48.107 +7548B6CF-79D9-461D-A0C5-20B861406FAC 1 CBC: RED BLOOD CELL COUNT 4.8 m/cumm 1982-09-05 11:13:13.630 +7548B6CF-79D9-461D-A0C5-20B861406FAC 1 METABOLIC: GLUCOSE 98.6 mg/dL 1982-09-05 06:23:26.127 +7548B6CF-79D9-461D-A0C5-20B861406FAC 2 CBC: RED BLOOD CELL COUNT 5.2 m/cumm 2000-09-22 10:23:55.477 +7548B6CF-79D9-461D-A0C5-20B861406FAC 2 CBC: MCHC 34.2 g/dl 2000-09-22 10:08:49.743 +7548B6CF-79D9-461D-A0C5-20B861406FAC 3 METABOLIC: POTASSIUM 4.5 mmol/L 2003-04-29 07:29:55.540 +7548B6CF-79D9-461D-A0C5-20B861406FAC 3 METABOLIC: GLUCOSE 118.2 mg/dL 2003-04-29 07:38:44.277 +7548B6CF-79D9-461D-A0C5-20B861406FAC 4 METABOLIC: ANION GAP 3.9 mmol/L 2008-10-13 23:16:49.407 +7548B6CF-79D9-461D-A0C5-20B861406FAC 4 METABOLIC: ALBUMIN 2.6 gm/dL 2008-10-13 22:20:12.050 +B5D31F01-7273-4901-B56F-8139769A11EF 1 METABOLIC: TOTAL PROTEIN 7.4 gm/dL 1997-05-06 06:52:08.553 +B5D31F01-7273-4901-B56F-8139769A11EF 1 CBC: HEMOGLOBIN 12.6 gm/dl 1997-05-06 05:33:11.123 +B5D31F01-7273-4901-B56F-8139769A11EF 2 CBC: LYMPHOCYTES 2.6 k/cumm 2004-08-24 03:12:39.787 +B5D31F01-7273-4901-B56F-8139769A11EF 2 CBC: EOSINOPHILS 0.3 k/cumm 2004-08-24 01:59:26.997 +B5D31F01-7273-4901-B56F-8139769A11EF 3 CBC: MONOCYTES 0.2 k/cumm 2010-07-15 13:29:57.343 +B5D31F01-7273-4901-B56F-8139769A11EF 3 METABOLIC: AST/SGOT 13.1 U/L 2010-07-15 12:47:06.943 +80D356B4-F974-441F-A5F2-F95986D119A2 1 METABOLIC: SODIUM 144.9 mmol/L 1965-01-29 12:17:26.573 +80D356B4-F974-441F-A5F2-F95986D119A2 1 METABOLIC: ALT/SGPT 53.3 U/L 1965-01-30 03:56:26.823 +80D356B4-F974-441F-A5F2-F95986D119A2 2 CBC: MONOCYTES 0.4 k/cumm 1970-09-22 21:07:13.297 +80D356B4-F974-441F-A5F2-F95986D119A2 2 CBC: RDW 9.2 % 1970-09-22 19:38:45.207 +80D356B4-F974-441F-A5F2-F95986D119A2 3 METABOLIC: CHLORIDE 91.1 mmol/L 1984-06-01 04:52:40.400 +80D356B4-F974-441F-A5F2-F95986D119A2 3 CBC: BASOPHILS 0 k/cumm 1984-05-31 18:57:59.103 +80D356B4-F974-441F-A5F2-F95986D119A2 4 URINALYSIS: PH 5.6 no unit 1990-05-22 05:18:39.450 +80D356B4-F974-441F-A5F2-F95986D119A2 4 CBC: ABSOLUTE LYMPHOCYTES 17.2 % 1990-05-21 23:14:15.533 +80D356B4-F974-441F-A5F2-F95986D119A2 5 METABOLIC: CALCIUM 7.5 mg/dL 1991-12-11 10:51:09.793 +80D356B4-F974-441F-A5F2-F95986D119A2 5 METABOLIC: AST/SGOT 27.3 U/L 1991-12-11 14:56:20.600 +80D356B4-F974-441F-A5F2-F95986D119A2 6 URINALYSIS: PH 6.3 no unit 2007-10-06 01:34:17.953 +80D356B4-F974-441F-A5F2-F95986D119A2 6 METABOLIC: BUN 8.6 mg/dL 2007-10-06 05:11:12.707 +80D356B4-F974-441F-A5F2-F95986D119A2 7 METABOLIC: CARBON DIOXIDE 31.3 mmol/L 2012-10-28 05:04:46.203 +80D356B4-F974-441F-A5F2-F95986D119A2 7 CBC: BASOPHILS 0.1 k/cumm 2012-10-28 15:16:20.073 +A0A976C8-9B30-4492-B8C4-5B25095B9192 1 METABOLIC: GLUCOSE 106.5 mg/dL 1949-07-26 08:07:48.733 +A0A976C8-9B30-4492-B8C4-5B25095B9192 1 CBC: MCH 28.7 pg 1949-07-26 05:28:08.137 +A0A976C8-9B30-4492-B8C4-5B25095B9192 2 METABOLIC: ALT/SGPT 65.5 U/L 1951-08-12 22:02:38.080 +A0A976C8-9B30-4492-B8C4-5B25095B9192 2 METABOLIC: ALBUMIN 2.8 gm/dL 1951-08-13 05:10:14.477 +A0A976C8-9B30-4492-B8C4-5B25095B9192 3 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1954-01-17 15:53:15.810 +A0A976C8-9B30-4492-B8C4-5B25095B9192 3 CBC: RDW 15.4 % 1954-01-18 03:21:35.570 +A0A976C8-9B30-4492-B8C4-5B25095B9192 4 METABOLIC: BILI TOTAL 1.2 mg/dL 1967-12-02 11:28:00.987 +A0A976C8-9B30-4492-B8C4-5B25095B9192 4 METABOLIC: ANION GAP 17.9 mmol/L 1967-12-02 08:27:56.580 +A0A976C8-9B30-4492-B8C4-5B25095B9192 5 CBC: WHITE BLOOD CELL COUNT 3.2 k/cumm 1996-04-29 02:16:05.333 +A0A976C8-9B30-4492-B8C4-5B25095B9192 5 METABOLIC: CARBON DIOXIDE 24.7 mmol/L 1996-04-29 12:22:48.620 +A0A976C8-9B30-4492-B8C4-5B25095B9192 6 CBC: PLATELET COUNT 198.8 k/cumm 2005-06-20 22:19:39.837 +A0A976C8-9B30-4492-B8C4-5B25095B9192 6 METABOLIC: BILI TOTAL 0.1 mg/dL 2005-06-20 17:08:20.570 +A0A976C8-9B30-4492-B8C4-5B25095B9192 7 METABOLIC: BUN 29.8 mg/dL 2012-11-27 05:32:17.533 +A0A976C8-9B30-4492-B8C4-5B25095B9192 7 METABOLIC: ALT/SGPT 37.1 U/L 2012-11-27 05:27:29.407 +016A590E-D093-4667-A5DA-D68EA6987D93 1 CBC: NEUTROPHILS 9 k/cumm 1986-12-01 06:49:21.037 +016A590E-D093-4667-A5DA-D68EA6987D93 1 METABOLIC: GLUCOSE 66.6 mg/dL 1986-12-01 18:54:20.190 +016A590E-D093-4667-A5DA-D68EA6987D93 2 METABOLIC: TOTAL PROTEIN 6.4 gm/dL 1998-06-11 07:03:54.613 +016A590E-D093-4667-A5DA-D68EA6987D93 2 METABOLIC: GLUCOSE 104.4 mg/dL 1998-06-10 23:52:09.680 +016A590E-D093-4667-A5DA-D68EA6987D93 3 METABOLIC: BUN 6.4 mg/dL 1999-10-29 15:36:38.700 +016A590E-D093-4667-A5DA-D68EA6987D93 3 METABOLIC: ALBUMIN 4.6 gm/dL 1999-10-29 12:40:14.440 +016A590E-D093-4667-A5DA-D68EA6987D93 4 METABOLIC: SODIUM 134.5 mmol/L 2001-03-27 17:13:28.900 +016A590E-D093-4667-A5DA-D68EA6987D93 4 CBC: MCH 39.1 pg 2001-03-27 07:54:03.313 +016A590E-D093-4667-A5DA-D68EA6987D93 5 CBC: RDW 13.5 % 2008-02-23 01:14:48.087 +016A590E-D093-4667-A5DA-D68EA6987D93 5 METABOLIC: CALCIUM 11.8 mg/dL 2008-02-22 15:11:21.007 +3B11D6B3-A36A-4B69-A437-C29BF425A941 1 METABOLIC: CHLORIDE 101.8 mmol/L 1981-01-01 00:19:53.040 +3B11D6B3-A36A-4B69-A437-C29BF425A941 1 CBC: LYMPHOCYTES 3.7 k/cumm 1981-01-01 02:49:04.427 +3B11D6B3-A36A-4B69-A437-C29BF425A941 2 URINALYSIS: WHITE BLOOD CELLS 2 wbc/hpf 2004-05-12 06:33:00.260 +3B11D6B3-A36A-4B69-A437-C29BF425A941 2 CBC: LYMPHOCYTES 3.2 k/cumm 2004-05-11 19:38:43.150 +3B11D6B3-A36A-4B69-A437-C29BF425A941 3 URINALYSIS: RED BLOOD CELLS 1.1 rbc/hpf 2009-02-06 05:32:57.893 +3B11D6B3-A36A-4B69-A437-C29BF425A941 3 CBC: MONOCYTES 0.9 k/cumm 2009-02-06 11:11:14.797 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 1 METABOLIC: SODIUM 135.2 mmol/L 1971-05-26 21:41:58.083 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 1 METABOLIC: ALK PHOS 83.4 U/L 1971-05-27 13:12:09.897 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 2 METABOLIC: CALCIUM 9 mg/dL 2003-04-28 21:35:51.810 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 2 URINALYSIS: RED BLOOD CELLS 1.5 rbc/hpf 2003-04-29 10:50:22.100 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 3 METABOLIC: BUN 9.7 mg/dL 2007-07-10 17:40:13.450 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 3 CBC: MEAN CORPUSCULAR VOLUME 82.4 fl 2007-07-11 15:32:18.107 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 4 METABOLIC: POTASSIUM 4.1 mmol/L 2011-01-28 13:31:04.097 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE 4 METABOLIC: ALK PHOS 65.3 U/L 2011-01-28 22:08:42.623 +B2EB15FA-5431-4804-9309-4215BDC778C0 1 CBC: EOSINOPHILS 0.5 k/cumm 1970-02-27 22:10:37.267 +B2EB15FA-5431-4804-9309-4215BDC778C0 1 CBC: ABSOLUTE LYMPHOCYTES 19.8 % 1970-02-28 12:13:16.383 +B2EB15FA-5431-4804-9309-4215BDC778C0 2 CBC: MONOCYTES 1.2 k/cumm 1984-03-16 04:36:45.920 +B2EB15FA-5431-4804-9309-4215BDC778C0 2 CBC: MCHC 39.2 g/dl 1984-03-16 04:05:59.473 +B2EB15FA-5431-4804-9309-4215BDC778C0 3 CBC: LYMPHOCYTES 3.5 k/cumm 2010-04-25 20:37:27.660 +B2EB15FA-5431-4804-9309-4215BDC778C0 3 CBC: HEMATOCRIT 42.8 % 2010-04-26 04:54:21.907 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 1 METABOLIC: BILI TOTAL 0.9 mg/dL 1942-08-10 06:33:49.637 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 1 METABOLIC: CARBON DIOXIDE 18.2 mmol/L 1942-08-10 20:55:25.393 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 2 METABOLIC: BUN 8.5 mg/dL 1976-12-12 09:09:02.413 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 2 METABOLIC: ALT/SGPT 69.5 U/L 1976-12-12 11:27:36.190 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 3 CBC: ABSOLUTE LYMPHOCYTES 22.6 % 1983-07-09 18:15:00.900 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 3 CBC: HEMOGLOBIN 16.3 gm/dl 1983-07-09 13:46:34.787 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 4 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1991-09-13 05:15:03.420 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 4 CBC: RED BLOOD CELL COUNT 6.8 m/cumm 1991-09-13 11:43:12.947 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 5 CBC: MCH 37.1 pg 2007-05-26 23:37:09.410 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 5 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2007-05-26 22:50:26.177 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 6 METABOLIC: ALK PHOS 58.4 U/L 2010-01-07 01:25:51.800 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 6 CBC: LYMPHOCYTES 1.1 k/cumm 2010-01-07 04:22:48.240 +C5D09468-574F-4802-B56F-DB38F4EB1687 1 CBC: MCH 25.9 pg 1959-09-24 08:57:48.380 +C5D09468-574F-4802-B56F-DB38F4EB1687 1 CBC: MONOCYTES 0.7 k/cumm 1959-09-24 08:53:46.950 +C5D09468-574F-4802-B56F-DB38F4EB1687 2 METABOLIC: CALCIUM 10.5 mg/dL 1975-04-14 05:46:33.603 +C5D09468-574F-4802-B56F-DB38F4EB1687 2 METABOLIC: BUN 13.4 mg/dL 1975-04-14 16:30:10.033 +C5D09468-574F-4802-B56F-DB38F4EB1687 3 METABOLIC: GLUCOSE 78 mg/dL 2006-06-01 14:39:09.503 +C5D09468-574F-4802-B56F-DB38F4EB1687 3 METABOLIC: BUN 28 mg/dL 2006-06-01 08:02:36.017 +C5D09468-574F-4802-B56F-DB38F4EB1687 4 METABOLIC: ALBUMIN 4.9 gm/dL 2011-03-30 22:07:58.087 +C5D09468-574F-4802-B56F-DB38F4EB1687 4 METABOLIC: CARBON DIOXIDE 18.6 mmol/L 2011-03-31 05:53:46.227 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 1 URINALYSIS: PH 5.2 no unit 1993-09-22 23:22:33.243 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 1 CBC: EOSINOPHILS 0.1 k/cumm 1993-09-22 23:20:59.810 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 2 METABOLIC: ANION GAP 4.1 mmol/L 1994-02-07 04:39:57.920 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 2 CBC: BASOPHILS 0.2 k/cumm 1994-02-06 18:08:07.463 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 3 CBC: ABSOLUTE LYMPHOCYTES 27.9 % 2002-03-23 04:22:54.503 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 3 CBC: EOSINOPHILS 0.3 k/cumm 2002-03-22 23:51:51.527 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 4 CBC: MCHC 38.1 g/dl 2008-03-22 19:39:16.620 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB 4 METABOLIC: ALBUMIN 5.9 gm/dL 2008-03-23 10:54:08.047 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 1 METABOLIC: SODIUM 131.5 mmol/L 1989-10-12 22:28:35.973 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 1 METABOLIC: CREATININE 0.6 mg/dL 1989-10-12 22:54:54.543 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 2 METABOLIC: ALBUMIN 4.8 gm/dL 1994-04-02 03:07:50.873 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 2 METABOLIC: CARBON DIOXIDE 21.1 mmol/L 1994-04-02 00:37:41.190 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 3 CBC: MONOCYTES 0.9 k/cumm 2003-05-09 01:23:39.070 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 3 METABOLIC: POTASSIUM 5.9 mmol/L 2003-05-09 01:03:08.547 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 4 METABOLIC: CHLORIDE 106.9 mmol/L 2005-02-05 09:46:16.383 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 5 METABOLIC: ALK PHOS 73.4 U/L 2012-11-27 17:13:53.043 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD 5 CBC: BASOPHILS 0.1 k/cumm 2012-11-27 11:53:18.880 +868E700E-3C56-458F-A477-078D671DCB20 1 CBC: MCH 23.4 pg 2002-11-29 13:57:01.813 +868E700E-3C56-458F-A477-078D671DCB20 1 CBC: RED BLOOD CELL COUNT 3.1 m/cumm 2002-11-29 17:42:55.623 +868E700E-3C56-458F-A477-078D671DCB20 2 CBC: PLATELET COUNT 379 k/cumm 2009-01-03 03:38:48.593 +868E700E-3C56-458F-A477-078D671DCB20 2 METABOLIC: POTASSIUM 5.9 mmol/L 2009-01-03 02:40:28.827 +56A35E74-90BE-44A0-B7BA-7743BB152133 1 URINALYSIS: WHITE BLOOD CELLS 2.4 wbc/hpf 1993-04-09 13:20:34.917 +56A35E74-90BE-44A0-B7BA-7743BB152133 1 CBC: ABSOLUTE NEUTROPHILS 74.8 % 1993-04-09 03:32:27.517 +56A35E74-90BE-44A0-B7BA-7743BB152133 2 METABOLIC: CARBON DIOXIDE 31.5 mmol/L 2003-10-11 06:47:34.897 +56A35E74-90BE-44A0-B7BA-7743BB152133 2 METABOLIC: BUN 22.1 mg/dL 2003-10-11 08:32:33.053 +56A35E74-90BE-44A0-B7BA-7743BB152133 3 CBC: PLATELET COUNT 425.7 k/cumm 2011-01-01 03:45:38.400 +56A35E74-90BE-44A0-B7BA-7743BB152133 3 URINALYSIS: RED BLOOD CELLS 1.3 rbc/hpf 2011-01-01 05:14:03.617 +CC12B481-B516-455B-884F-4CA900B29F2E 1 URINALYSIS: RED BLOOD CELLS 2.1 rbc/hpf 2004-01-23 03:20:08.517 +CC12B481-B516-455B-884F-4CA900B29F2E 1 METABOLIC: CALCIUM 9.4 mg/dL 2004-01-23 03:12:08.157 +CC12B481-B516-455B-884F-4CA900B29F2E 2 URINALYSIS: RED BLOOD CELLS 2.9 rbc/hpf 2006-12-11 22:47:38.407 +CC12B481-B516-455B-884F-4CA900B29F2E 2 METABOLIC: AST/SGOT 37.4 U/L 2006-12-11 19:05:56.863 +CC12B481-B516-455B-884F-4CA900B29F2E 3 CBC: MONOCYTES 0.1 k/cumm 2012-04-29 10:47:41.067 +CC12B481-B516-455B-884F-4CA900B29F2E 3 METABOLIC: ALK PHOS 118.9 U/L 2012-04-28 23:34:45.980 +714823AF-C52C-414C-B53B-C43EACD194C3 1 METABOLIC: BUN 7.1 mg/dL 1970-08-04 16:51:53.893 +714823AF-C52C-414C-B53B-C43EACD194C3 1 CBC: EOSINOPHILS 0.2 k/cumm 1970-08-05 03:35:58.013 +714823AF-C52C-414C-B53B-C43EACD194C3 2 URINALYSIS: WHITE BLOOD CELLS 3.9 wbc/hpf 1992-09-11 18:42:56.677 +714823AF-C52C-414C-B53B-C43EACD194C3 2 CBC: RED BLOOD CELL COUNT 5.3 m/cumm 1992-09-11 18:34:18.643 +714823AF-C52C-414C-B53B-C43EACD194C3 3 URINALYSIS: PH 6.7 no unit 2011-06-06 03:15:41.623 +714823AF-C52C-414C-B53B-C43EACD194C3 3 METABOLIC: CARBON DIOXIDE 32.7 mmol/L 2011-06-06 15:35:41.157 +3231F930-2978-4F50-8234-755449851E7B 1 CBC: MCHC 36.2 g/dl 2000-07-14 03:11:10.443 +3231F930-2978-4F50-8234-755449851E7B 1 METABOLIC: CREATININE 1 mg/dL 2000-07-14 03:48:44.613 +3231F930-2978-4F50-8234-755449851E7B 2 CBC: MCHC 32.3 g/dl 2004-01-24 10:08:19.080 +3231F930-2978-4F50-8234-755449851E7B 2 METABOLIC: ALT/SGPT 28.6 U/L 2004-01-24 18:49:05.913 +3231F930-2978-4F50-8234-755449851E7B 3 CBC: ABSOLUTE NEUTROPHILS 77.5 % 2006-06-11 09:07:01.923 +3231F930-2978-4F50-8234-755449851E7B 3 METABOLIC: BUN 15.6 mg/dL 2006-06-11 05:55:47.613 +3231F930-2978-4F50-8234-755449851E7B 4 CBC: HEMOGLOBIN 12.9 gm/dl 2007-05-23 19:10:34.053 +3231F930-2978-4F50-8234-755449851E7B 4 METABOLIC: GLUCOSE 123.5 mg/dL 2007-05-23 02:48:30.777 +3231F930-2978-4F50-8234-755449851E7B 5 METABOLIC: BUN 12.5 mg/dL 2009-08-04 09:08:04.330 +3231F930-2978-4F50-8234-755449851E7B 5 CBC: RED BLOOD CELL COUNT 6.8 m/cumm 2009-08-04 02:00:15.750 +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 1 METABOLIC: BUN 28.2 mg/dL 1988-02-26 14:32:14.597 +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 1 CBC: LYMPHOCYTES 4.3 k/cumm 1988-02-27 03:21:56.777 +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 2 METABOLIC: CALCIUM 8.8 mg/dL 2008-06-23 16:34:41.193 +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 2 URINALYSIS: PH 4.9 no unit 2008-06-23 17:12:27.020 +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 1 METABOLIC: ANION GAP 16.7 mmol/L 2007-10-04 04:52:33.147 +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 1 METABOLIC: AST/SGOT 13.6 U/L 2007-10-04 17:40:22.383 +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 2 METABOLIC: ALK PHOS 77.5 U/L 2010-08-05 18:32:45.197 +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C 2 URINALYSIS: RED BLOOD CELLS 0.1 rbc/hpf 2010-08-06 01:46:22.323 +21792512-2D40-4326-BEA2-A40127EB24FF 1 CBC: RED BLOOD CELL COUNT 3.2 m/cumm 1960-10-16 13:10:11.270 +21792512-2D40-4326-BEA2-A40127EB24FF 1 CBC: WHITE BLOOD CELL COUNT 6.8 k/cumm 1960-10-16 14:13:54.440 +21792512-2D40-4326-BEA2-A40127EB24FF 2 METABOLIC: AST/SGOT 23 U/L 1961-08-24 09:26:06.500 +21792512-2D40-4326-BEA2-A40127EB24FF 2 CBC: WHITE BLOOD CELL COUNT 4.3 k/cumm 1961-08-24 18:14:59.747 +21792512-2D40-4326-BEA2-A40127EB24FF 3 METABOLIC: ALK PHOS 108.9 U/L 1966-12-26 17:55:22.237 +21792512-2D40-4326-BEA2-A40127EB24FF 3 CBC: ABSOLUTE NEUTROPHILS 79.2 % 1966-12-26 02:34:42.780 +21792512-2D40-4326-BEA2-A40127EB24FF 4 CBC: MCHC 37.6 g/dl 1995-11-11 10:04:17.043 +21792512-2D40-4326-BEA2-A40127EB24FF 4 METABOLIC: CHLORIDE 100.4 mmol/L 1995-11-11 17:34:19.423 +21792512-2D40-4326-BEA2-A40127EB24FF 5 METABOLIC: ALBUMIN 5 gm/dL 2006-02-21 04:17:48.753 +21792512-2D40-4326-BEA2-A40127EB24FF 5 CBC: MCHC 36 g/dl 2006-02-21 00:21:17.867 +21792512-2D40-4326-BEA2-A40127EB24FF 6 METABOLIC: CREATININE 0.9 mg/dL 2012-02-11 09:16:58.887 +21792512-2D40-4326-BEA2-A40127EB24FF 6 CBC: PLATELET COUNT 275.2 k/cumm 2012-02-11 09:55:35.510 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 1 CBC: ABSOLUTE NEUTROPHILS 61.6 % 1987-01-11 05:33:22.000 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 1 METABOLIC: TOTAL PROTEIN 9.3 gm/dL 1987-01-10 12:08:21.813 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 2 URINALYSIS: PH 5.3 no unit 1999-01-04 02:12:21.107 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 2 CBC: RDW 13.7 % 1999-01-04 04:45:22.130 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 3 METABOLIC: BUN 12.4 mg/dL 2004-01-18 22:43:02.740 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 3 CBC: PLATELET COUNT 319.4 k/cumm 2004-01-18 03:06:01.190 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 4 METABOLIC: SODIUM 125.4 mmol/L 2013-01-12 18:02:02.530 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F 4 METABOLIC: ALBUMIN 3.9 gm/dL 2013-01-12 16:18:18.827 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 1 URINALYSIS: PH 7 no unit 1982-12-12 17:49:27.623 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 1 METABOLIC: CREATININE 0.7 mg/dL 1982-12-12 14:58:57.467 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 2 URINALYSIS: RED BLOOD CELLS 2.3 rbc/hpf 2003-01-10 10:32:07.990 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 2 METABOLIC: CALCIUM 7.4 mg/dL 2003-01-10 07:28:12.953 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 3 CBC: MEAN CORPUSCULAR VOLUME 80.5 fl 2010-01-27 16:31:36.700 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC 3 CBC: PLATELET COUNT 298.1 k/cumm 2010-01-28 05:13:50.293 +36775002-9EC3-4889-AD4F-80DC6855C8D8 1 METABOLIC: CARBON DIOXIDE 30.3 mmol/L 1991-01-01 00:36:26.770 +36775002-9EC3-4889-AD4F-80DC6855C8D8 1 METABOLIC: ANION GAP 4.4 mmol/L 1990-12-31 22:42:13.490 +36775002-9EC3-4889-AD4F-80DC6855C8D8 2 METABOLIC: ALT/SGPT 50.4 U/L 1992-08-16 06:37:21.577 +36775002-9EC3-4889-AD4F-80DC6855C8D8 2 CBC: HEMATOCRIT 50.9 % 1992-08-16 00:51:21.893 +36775002-9EC3-4889-AD4F-80DC6855C8D8 3 METABOLIC: CREATININE 0.9 mg/dL 1992-10-10 12:06:53.677 +36775002-9EC3-4889-AD4F-80DC6855C8D8 3 URINALYSIS: WHITE BLOOD CELLS 0.2 wbc/hpf 1992-10-10 06:59:26.213 +36775002-9EC3-4889-AD4F-80DC6855C8D8 4 CBC: ABSOLUTE LYMPHOCYTES 16.5 % 2004-10-01 17:17:58.140 +36775002-9EC3-4889-AD4F-80DC6855C8D8 4 CBC: RDW 15.4 % 2004-10-01 16:48:34.370 +36775002-9EC3-4889-AD4F-80DC6855C8D8 5 URINALYSIS: RED BLOOD CELLS 2.3 rbc/hpf 2005-03-16 06:38:10.953 +36775002-9EC3-4889-AD4F-80DC6855C8D8 5 CBC: PLATELET COUNT 125.9 k/cumm 2005-03-16 08:01:23.620 +36775002-9EC3-4889-AD4F-80DC6855C8D8 6 CBC: LYMPHOCYTES 3.6 k/cumm 2008-01-30 19:40:07.123 +36775002-9EC3-4889-AD4F-80DC6855C8D8 6 METABOLIC: ALT/SGPT 26.3 U/L 2008-01-31 05:33:50.253 +4C201C71-CCED-40D1-9642-F9C8C485B854 1 METABOLIC: SODIUM 138.7 mmol/L 1945-03-26 15:12:16.583 +4C201C71-CCED-40D1-9642-F9C8C485B854 1 CBC: WHITE BLOOD CELL COUNT 3.6 k/cumm 1945-03-26 14:55:22.660 +4C201C71-CCED-40D1-9642-F9C8C485B854 2 METABOLIC: BILI TOTAL 0.9 mg/dL 1956-02-15 08:43:24.287 +4C201C71-CCED-40D1-9642-F9C8C485B854 2 CBC: LYMPHOCYTES 0.8 k/cumm 1956-02-15 07:59:19.663 +4C201C71-CCED-40D1-9642-F9C8C485B854 3 CBC: ABSOLUTE NEUTROPHILS 70.4 % 1977-12-10 06:50:45.473 +4C201C71-CCED-40D1-9642-F9C8C485B854 3 CBC: WHITE BLOOD CELL COUNT 8.6 k/cumm 1977-12-09 22:17:40.000 +4C201C71-CCED-40D1-9642-F9C8C485B854 4 CBC: RDW 12.1 % 1993-12-20 20:10:36.740 +4C201C71-CCED-40D1-9642-F9C8C485B854 4 METABOLIC: SODIUM 129.2 mmol/L 1993-12-21 05:00:38.473 +4C201C71-CCED-40D1-9642-F9C8C485B854 5 METABOLIC: BILI TOTAL 0.2 mg/dL 1997-04-04 19:59:12.927 +4C201C71-CCED-40D1-9642-F9C8C485B854 5 CBC: MONOCYTES 0.7 k/cumm 1997-04-05 06:58:43.617 +4C201C71-CCED-40D1-9642-F9C8C485B854 6 CBC: MONOCYTES 0.9 k/cumm 2012-09-23 05:02:14.607 +4C201C71-CCED-40D1-9642-F9C8C485B854 6 METABOLIC: ALBUMIN 4 gm/dL 2012-09-23 13:11:23.113 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 1 URINALYSIS: RED BLOOD CELLS 0.1 rbc/hpf 1991-11-03 07:42:22.860 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 1 METABOLIC: ANION GAP 3 mmol/L 1991-11-03 05:05:35.647 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 2 CBC: BASOPHILS 0.1 k/cumm 2000-02-18 18:58:28.207 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 2 METABOLIC: ALBUMIN 5.9 gm/dL 2000-02-18 10:08:44.830 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 3 CBC: NEUTROPHILS 6.7 k/cumm 2008-05-28 02:06:52.483 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A 3 CBC: HEMATOCRIT 34.7 % 2008-05-28 00:04:43.657 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 1 METABOLIC: SODIUM 125.2 mmol/L 1982-10-06 11:14:34.600 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 1 METABOLIC: POTASSIUM 4.8 mmol/L 1982-10-06 07:35:13.213 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 2 METABOLIC: ALT/SGPT 34.9 U/L 2005-11-30 10:05:45.717 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 2 METABOLIC: AST/SGOT 19.4 U/L 2005-11-30 17:13:56.650 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 3 CBC: WHITE BLOOD CELL COUNT 6.4 k/cumm 2011-01-25 08:19:16.387 +C65A4ADE-112E-49E4-B72A-0DED22C242ED 3 METABOLIC: CALCIUM 8.3 mg/dL 2011-01-25 05:45:59.957 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 1 CBC: MEAN CORPUSCULAR VOLUME 80.7 fl 1985-09-09 20:25:03.173 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1985-09-09 21:57:42.160 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 2 CBC: ABSOLUTE NEUTROPHILS 76.2 % 1994-07-22 20:24:10.897 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 2 METABOLIC: CALCIUM 10.7 mg/dL 1994-07-23 01:41:28.587 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 3 METABOLIC: CARBON DIOXIDE 34.9 mmol/L 2003-03-21 11:32:01.280 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 3 METABOLIC: CALCIUM 10.1 mg/dL 2003-03-21 14:13:43.553 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 4 CBC: PLATELET COUNT 171.1 k/cumm 2007-07-04 01:30:19.680 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 4 CBC: HEMOGLOBIN 10.5 gm/dl 2007-07-04 18:45:12.277 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 5 CBC: MEAN CORPUSCULAR VOLUME 95.2 fl 2012-04-24 17:04:53.060 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 5 CBC: MCH 32.7 pg 2012-04-24 15:42:58.297 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1980-07-16 08:29:42.073 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 1 CBC: ABSOLUTE LYMPHOCYTES 32.4 % 1980-07-15 20:17:03.067 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 2 METABOLIC: ALK PHOS 125.2 U/L 2003-01-26 20:56:14.693 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 2 METABOLIC: POTASSIUM 4.8 mmol/L 2003-01-26 22:54:42.863 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 3 METABOLIC: BUN 25.8 mg/dL 2004-09-25 07:23:08.857 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 3 METABOLIC: AST/SGOT 23.7 U/L 2004-09-25 04:35:57.140 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 4 CBC: MCHC 28.2 g/dl 2004-10-25 20:34:25.697 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 4 METABOLIC: CALCIUM 10.6 mg/dL 2004-10-25 16:22:32.970 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 5 METABOLIC: GLUCOSE 131.2 mg/dL 2012-01-11 10:25:55.843 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF 5 METABOLIC: CARBON DIOXIDE 27.5 mmol/L 2012-01-11 14:06:07.313 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 1 CBC: LYMPHOCYTES 1.3 k/cumm 1978-07-10 00:37:08.293 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 1 METABOLIC: POTASSIUM 4.5 mmol/L 1978-07-09 23:02:57.597 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 2 CBC: HEMOGLOBIN 10.3 gm/dl 1982-10-15 02:11:01.467 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 2 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1982-10-14 13:38:26.477 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 3 METABOLIC: GLUCOSE 72.6 mg/dL 1990-03-13 05:35:55.963 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 3 METABOLIC: CHLORIDE 103.6 mmol/L 1990-03-13 12:00:51.933 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 4 METABOLIC: CHLORIDE 110.4 mmol/L 1994-05-15 12:48:18.910 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 4 METABOLIC: ANION GAP 6 mmol/L 1994-05-16 08:35:57.490 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 5 METABOLIC: GLUCOSE 129.3 mg/dL 2001-01-26 18:32:35.523 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 5 CBC: ABSOLUTE LYMPHOCYTES 29.9 % 2001-01-26 11:23:15.097 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 6 CBC: EOSINOPHILS 0.3 k/cumm 2001-12-30 07:57:06.550 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 6 URINALYSIS: RED BLOOD CELLS 0.1 rbc/hpf 2001-12-30 00:05:14.700 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 7 CBC: HEMATOCRIT 30.3 % 2011-10-22 00:17:18.873 +7A025E77-7832-4F53-B9A7-09A3F98AC17E 7 URINALYSIS: PH 5.2 no unit 2011-10-21 22:45:20.057 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 1 URINALYSIS: PH 5.5 no unit 1993-02-23 21:23:03.880 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 1 METABOLIC: ANION GAP 6.2 mmol/L 1993-02-24 06:19:01.790 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 2 CBC: MEAN CORPUSCULAR VOLUME 92.4 fl 2002-11-29 09:37:22.300 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 2 CBC: PLATELET COUNT 363.1 k/cumm 2002-11-28 23:04:00.743 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 3 METABOLIC: CHLORIDE 99.9 mmol/L 2011-07-24 21:40:20.067 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 3 URINALYSIS: WHITE BLOOD CELLS 5.1 wbc/hpf 2011-07-24 21:42:48.727 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 1 CBC: NEUTROPHILS 2.2 k/cumm 1994-12-04 15:45:56.270 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 1 CBC: MCHC 31.2 g/dl 1994-12-04 21:57:20.890 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 2 CBC: EOSINOPHILS 0.4 k/cumm 2007-10-31 23:45:30.837 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 2 METABOLIC: TOTAL PROTEIN 6.4 gm/dL 2007-11-01 04:43:13.697 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 3 METABOLIC: ALK PHOS 119.6 U/L 2009-05-24 22:55:58.373 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 3 CBC: LYMPHOCYTES 2.3 k/cumm 2009-05-24 20:46:48.280 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 1 METABOLIC: CALCIUM 9.6 mg/dL 1970-05-23 09:58:48.260 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1970-05-23 18:46:03.523 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 2 METABOLIC: BILI TOTAL 0.3 mg/dL 2002-01-09 21:57:42.997 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 2 METABOLIC: ANION GAP 14.1 mmol/L 2002-01-09 03:20:47.717 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 3 CBC: MONOCYTES 0.7 k/cumm 2008-03-06 19:43:15.543 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 3 METABOLIC: ALBUMIN 3.9 gm/dL 2008-03-06 23:28:45.527 +0681FA35-A794-4684-97BD-00B88370DB41 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1998-06-21 20:40:21.430 +0681FA35-A794-4684-97BD-00B88370DB41 1 METABOLIC: CARBON DIOXIDE 21.7 mmol/L 1998-06-21 22:26:39.720 +0681FA35-A794-4684-97BD-00B88370DB41 2 URINALYSIS: WHITE BLOOD CELLS 5.2 wbc/hpf 2010-11-21 15:26:58.917 +0681FA35-A794-4684-97BD-00B88370DB41 2 CBC: RED BLOOD CELL COUNT 4.3 m/cumm 2010-11-21 15:38:57.580 +2E26695A-EFB0-4C7F-9318-E3030B154E39 1 URINALYSIS: PH 5.1 no unit 1988-01-01 23:30:30.367 +2E26695A-EFB0-4C7F-9318-E3030B154E39 1 METABOLIC: CARBON DIOXIDE 19.9 mmol/L 1988-01-02 16:45:02.893 +2E26695A-EFB0-4C7F-9318-E3030B154E39 2 CBC: EOSINOPHILS 0.6 k/cumm 2012-10-28 09:05:02.047 +2E26695A-EFB0-4C7F-9318-E3030B154E39 2 CBC: LYMPHOCYTES 4.4 k/cumm 2012-10-28 08:09:38.917 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 1 METABOLIC: ALBUMIN 5.2 gm/dL 1947-03-19 16:58:15.600 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 1 CBC: PLATELET COUNT 121.4 k/cumm 1947-03-20 06:32:55.473 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 2 METABOLIC: CARBON DIOXIDE 25.3 mmol/L 1999-09-05 01:21:40.933 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 2 METABOLIC: BILI TOTAL 0.4 mg/dL 1999-09-05 00:41:07.133 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 3 METABOLIC: ALBUMIN 3.6 gm/dL 2005-07-28 18:31:35.153 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 3 CBC: MONOCYTES 0.7 k/cumm 2005-07-28 08:42:34.940 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 4 URINALYSIS: WHITE BLOOD CELLS 2.2 wbc/hpf 2009-04-16 20:14:19.153 +DDC0BC57-7A4E-4E02-9282-177750B74FBC 4 METABOLIC: BUN 29.6 mg/dL 2009-04-16 19:40:25.400 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 1 CBC: HEMOGLOBIN 14 gm/dl 1967-06-03 06:24:45.730 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 1 CBC: BASOPHILS 0.1 k/cumm 1967-06-03 00:24:28.180 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 2 CBC: ABSOLUTE NEUTROPHILS 60.3 % 1983-11-25 08:25:37.360 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 2 METABOLIC: ALBUMIN 3.7 gm/dL 1983-11-25 09:18:33.900 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 3 CBC: LYMPHOCYTES 1 k/cumm 1999-04-23 13:54:41.530 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 3 CBC: MCHC 33.7 g/dl 1999-04-23 07:02:42.370 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 4 CBC: BASOPHILS 0.2 k/cumm 2001-11-14 07:57:38.550 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 4 METABOLIC: POTASSIUM 5.2 mmol/L 2001-11-14 07:53:27.417 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 5 METABOLIC: AST/SGOT 18.7 U/L 2010-07-21 20:43:58.090 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 5 CBC: MONOCYTES 0.9 k/cumm 2010-07-22 05:14:16.120 +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 1 METABOLIC: BILI TOTAL 0.7 mg/dL 1980-07-25 09:46:01.510 +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 1 METABOLIC: CARBON DIOXIDE 27.9 mmol/L 1980-07-25 07:03:29.827 +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 2 CBC: BASOPHILS 0 k/cumm 2010-10-24 18:31:21.570 +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 2 METABOLIC: BUN 5.5 mg/dL 2010-10-24 18:31:51.783 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1989-06-20 13:49:26.423 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 1 CBC: NEUTROPHILS 9.7 k/cumm 1989-06-20 20:06:21.937 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 2 METABOLIC: ALK PHOS 100.9 U/L 1995-06-01 06:26:05.820 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 2 CBC: MONOCYTES 0.2 k/cumm 1995-05-31 14:52:14.527 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 3 URINALYSIS: PH 6.5 no unit 2009-11-28 03:30:37.477 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B 3 CBC: EOSINOPHILS 0.4 k/cumm 2009-11-28 02:09:44.050 +E5478913-6819-4977-BB11-4C8B61175B56 1 CBC: MEAN CORPUSCULAR VOLUME 87.2 fl 2003-11-21 23:08:46.643 +E5478913-6819-4977-BB11-4C8B61175B56 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2003-11-21 23:14:32.757 +E5478913-6819-4977-BB11-4C8B61175B56 2 CBC: MCH 36.8 pg 2012-08-09 00:32:31.260 +E5478913-6819-4977-BB11-4C8B61175B56 2 METABOLIC: ANION GAP 17.5 mmol/L 2012-08-08 10:29:46.153 +66154E24-D3EE-4311-89DB-6195278F9B3C 1 CBC: PLATELET COUNT 401.5 k/cumm 1964-12-24 04:17:02.143 +66154E24-D3EE-4311-89DB-6195278F9B3C 1 METABOLIC: CREATININE 0.7 mg/dL 1964-12-24 09:47:21.710 +66154E24-D3EE-4311-89DB-6195278F9B3C 2 CBC: MONOCYTES 0.5 k/cumm 1983-11-01 15:20:35.317 +66154E24-D3EE-4311-89DB-6195278F9B3C 2 METABOLIC: AST/SGOT 12.8 U/L 1983-11-01 23:59:41.793 +66154E24-D3EE-4311-89DB-6195278F9B3C 3 CBC: HEMATOCRIT 35.9 % 1984-10-30 00:38:55.707 +66154E24-D3EE-4311-89DB-6195278F9B3C 3 METABOLIC: ALK PHOS 48.1 U/L 1984-10-30 10:57:08.680 +66154E24-D3EE-4311-89DB-6195278F9B3C 4 METABOLIC: ALT/SGPT 38 U/L 2005-09-22 10:30:52.980 +66154E24-D3EE-4311-89DB-6195278F9B3C 4 CBC: WHITE BLOOD CELL COUNT 3.8 k/cumm 2005-09-22 01:23:52.680 +66154E24-D3EE-4311-89DB-6195278F9B3C 5 METABOLIC: BUN 20.9 mg/dL 2009-07-10 03:57:45.063 +66154E24-D3EE-4311-89DB-6195278F9B3C 5 METABOLIC: CREATININE 0.6 mg/dL 2009-07-10 01:07:07.767 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 1 METABOLIC: BILI TOTAL 0.9 mg/dL 1972-11-19 19:20:51.793 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 1 URINALYSIS: WHITE BLOOD CELLS 2.4 wbc/hpf 1972-11-20 02:11:41.143 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 2 METABOLIC: TOTAL PROTEIN 7.7 gm/dL 2002-07-23 17:31:52.070 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 2 METABOLIC: BUN 12 mg/dL 2002-07-23 17:59:01.003 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 3 CBC: MEAN CORPUSCULAR VOLUME 75.2 fl 2011-06-14 22:12:59.573 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE 3 METABOLIC: BUN 27.3 mg/dL 2011-06-15 01:24:22.570 +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 1 METABOLIC: CALCIUM 8.7 mg/dL 1967-04-28 05:27:21.783 +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 1 METABOLIC: CREATININE 0.8 mg/dL 1967-04-28 05:12:11.443 +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 2 METABOLIC: BUN 20.2 mg/dL 2011-01-02 06:25:31.870 +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE 2 URINALYSIS: RED BLOOD CELLS 2.7 rbc/hpf 2011-01-02 05:37:31.857 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 1 METABOLIC: CREATININE 1 mg/dL 1948-07-21 00:22:14.270 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 1 METABOLIC: ANION GAP 13.1 mmol/L 1948-07-20 21:33:40.193 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 2 METABOLIC: AST/SGOT 31.6 U/L 1988-05-22 17:18:11.077 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 2 CBC: ABSOLUTE NEUTROPHILS 64.8 % 1988-05-22 11:12:46.430 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 3 CBC: HEMOGLOBIN 15.3 gm/dl 2010-09-02 15:33:32.390 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 3 CBC: MEAN CORPUSCULAR VOLUME 99 fl 2010-09-03 00:12:38.850 +3E462A8F-7B90-43A1-A8B6-AD82CB5002C9 1 METABOLIC: CALCIUM 8 mg/dL 2013-01-14 19:33:18.277 +3E462A8F-7B90-43A1-A8B6-AD82CB5002C9 1 METABOLIC: CREATININE 0.9 mg/dL 2013-01-14 18:30:31.507 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 2 CBC: ABSOLUTE LYMPHOCYTES 33.1 % 2003-05-19 00:39:17.370 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 2 CBC: MCH 26.8 pg 2003-05-19 01:20:04.200 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 3 METABOLIC: SODIUM 146.8 mmol/L 2009-03-07 23:29:04.167 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E 3 CBC: WHITE BLOOD CELL COUNT 4.7 k/cumm 2009-03-08 01:58:24.997 +A7142B71-A144-4D56-BD14-3E966B01DB37 1 CBC: ABSOLUTE LYMPHOCYTES 28.7 % 1983-09-21 17:09:06.783 +A7142B71-A144-4D56-BD14-3E966B01DB37 1 METABOLIC: CALCIUM 8 mg/dL 1983-09-21 16:57:54.647 +A7142B71-A144-4D56-BD14-3E966B01DB37 2 METABOLIC: TOTAL PROTEIN 9.6 gm/dL 1992-06-14 00:29:26.623 +A7142B71-A144-4D56-BD14-3E966B01DB37 2 CBC: MCH 39.7 pg 1992-06-14 16:56:08.407 +A7142B71-A144-4D56-BD14-3E966B01DB37 3 METABOLIC: TOTAL PROTEIN 6.5 gm/dL 1993-04-05 04:03:01.930 +A7142B71-A144-4D56-BD14-3E966B01DB37 3 METABOLIC: POTASSIUM 3.5 mmol/L 1993-04-05 04:47:38.947 +A7142B71-A144-4D56-BD14-3E966B01DB37 4 CBC: MONOCYTES 1.1 k/cumm 1997-03-11 06:46:03.950 +A7142B71-A144-4D56-BD14-3E966B01DB37 4 URINALYSIS: WHITE BLOOD CELLS 3.3 wbc/hpf 1997-03-10 15:39:55.413 +A7142B71-A144-4D56-BD14-3E966B01DB37 5 CBC: PLATELET COUNT 145.7 k/cumm 2008-08-22 01:34:36.777 +A7142B71-A144-4D56-BD14-3E966B01DB37 5 CBC: ABSOLUTE LYMPHOCYTES 24 % 2008-08-22 00:28:22.470 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 1 METABOLIC: CREATININE 1 mg/dL 1978-09-19 05:44:02.577 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 1 METABOLIC: SODIUM 129.1 mmol/L 1978-09-18 17:48:40.743 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 2 METABOLIC: BUN 20.2 mg/dL 1996-07-28 15:32:31.660 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 2 METABOLIC: CARBON DIOXIDE 24.5 mmol/L 1996-07-28 21:22:28.703 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 3 METABOLIC: BUN 10 mg/dL 2010-06-14 11:58:06.510 +FE0B9B59-1927-45B7-8556-E079DC1DE30A 3 CBC: MONOCYTES 0.3 k/cumm 2010-06-14 21:19:14.287 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 1 CBC: EOSINOPHILS 0.3 k/cumm 1965-08-24 03:46:43.003 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 1 METABOLIC: ALBUMIN 4.7 gm/dL 1965-08-24 03:49:37.040 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 2 CBC: HEMOGLOBIN 18.7 gm/dl 1967-04-04 23:08:44.340 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 2 CBC: EOSINOPHILS 0.6 k/cumm 1967-04-05 05:12:43.827 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 3 URINALYSIS: PH 5.6 no unit 1987-07-31 03:05:05.757 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 3 METABOLIC: ALT/SGPT 41.8 U/L 1987-07-31 05:10:13.793 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 4 CBC: MCH 35.8 pg 2005-01-17 21:33:32.647 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 4 METABOLIC: ALT/SGPT 40.9 U/L 2005-01-17 20:10:07.240 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 5 CBC: MCH 39.9 pg 2008-09-23 08:26:22.633 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E 5 CBC: PLATELET COUNT 263.4 k/cumm 2008-09-22 21:42:48.037 +1A220558-5996-43E1-AE5D-7B96180FED35 1 CBC: LYMPHOCYTES 1.9 k/cumm 1964-02-26 07:29:01.000 +1A220558-5996-43E1-AE5D-7B96180FED35 1 CBC: RED BLOOD CELL COUNT 5.3 m/cumm 1964-02-26 02:12:31.583 +1A220558-5996-43E1-AE5D-7B96180FED35 2 CBC: ABSOLUTE NEUTROPHILS 73.9 % 1979-04-21 00:17:56.070 +1A220558-5996-43E1-AE5D-7B96180FED35 2 CBC: WHITE BLOOD CELL COUNT 4.5 k/cumm 1979-04-21 01:35:07.023 +1A220558-5996-43E1-AE5D-7B96180FED35 3 URINALYSIS: WHITE BLOOD CELLS 5 wbc/hpf 2012-06-10 15:37:34.517 +1A220558-5996-43E1-AE5D-7B96180FED35 3 CBC: LYMPHOCYTES 3.5 k/cumm 2012-06-10 17:56:32.220 +7A7332AD-88B1-4848-9356-E5260E477C59 1 CBC: MCHC 35.4 g/dl 1968-10-11 12:31:58.693 +7A7332AD-88B1-4848-9356-E5260E477C59 1 CBC: RDW 16.2 % 1968-10-11 09:27:47.187 +7A7332AD-88B1-4848-9356-E5260E477C59 2 URINALYSIS: PH 7.5 no unit 1979-02-10 02:36:22.877 +7A7332AD-88B1-4848-9356-E5260E477C59 2 METABOLIC: ALBUMIN 2.7 gm/dL 1979-02-10 07:54:48.200 +7A7332AD-88B1-4848-9356-E5260E477C59 3 METABOLIC: BUN 24.1 mg/dL 1985-06-03 09:49:18.073 +7A7332AD-88B1-4848-9356-E5260E477C59 3 CBC: MCH 37.1 pg 1985-06-03 12:10:34.460 +7A7332AD-88B1-4848-9356-E5260E477C59 4 CBC: EOSINOPHILS 0.5 k/cumm 2006-01-16 14:32:26.793 +7A7332AD-88B1-4848-9356-E5260E477C59 4 METABOLIC: GLUCOSE 133.2 mg/dL 2006-01-17 06:53:08.530 +7A7332AD-88B1-4848-9356-E5260E477C59 5 CBC: EOSINOPHILS 0.5 k/cumm 2009-09-09 22:19:01.933 +7A7332AD-88B1-4848-9356-E5260E477C59 5 METABOLIC: BUN 10.9 mg/dL 2009-09-09 17:15:24.000 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 1 METABOLIC: AST/SGOT 31.1 U/L 1980-02-23 16:46:07.427 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 1 METABOLIC: POTASSIUM 6 mmol/L 1980-02-23 14:01:19.287 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 2 CBC: HEMATOCRIT 54.8 % 2001-02-17 06:16:06.150 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 2 CBC: LYMPHOCYTES 1.7 k/cumm 2001-02-17 01:04:14.350 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 3 METABOLIC: AST/SGOT 17.7 U/L 2001-05-18 10:56:41.077 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 3 CBC: MCHC 34.3 g/dl 2001-05-18 11:41:11.800 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 4 CBC: BASOPHILS 0.1 k/cumm 2011-11-16 15:27:01.300 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF 4 CBC: HEMOGLOBIN 10.9 gm/dl 2011-11-16 17:39:32.180 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 1 URINALYSIS: RED BLOOD CELLS 2.9 rbc/hpf 2000-03-30 19:31:22.070 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 1 CBC: EOSINOPHILS 0.3 k/cumm 2000-03-31 05:04:52.853 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 2 METABOLIC: ANION GAP 11.6 mmol/L 2004-11-20 01:16:31.280 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 2 CBC: PLATELET COUNT 265.2 k/cumm 2004-11-19 23:43:47.447 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 3 METABOLIC: AST/SGOT 24.6 U/L 2008-07-17 14:39:22.207 +36E2F89E-777A-4D77-9D95-0D70A8AB416F 3 URINALYSIS: WHITE BLOOD CELLS 5.3 wbc/hpf 2008-07-17 11:23:38.603 +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 1 CBC: LYMPHOCYTES 1.4 k/cumm 2006-11-02 19:07:08.343 +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 1 METABOLIC: SODIUM 135.2 mmol/L 2006-11-03 02:21:41.640 +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 2 CBC: WHITE BLOOD CELL COUNT 7.3 k/cumm 2009-02-06 11:54:06.170 +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 2 CBC: MONOCYTES 0.6 k/cumm 2009-02-06 18:39:39.987 +03A481F5-B32A-4A91-BD42-43EB78FEBA77 1 METABOLIC: SODIUM 144.5 mmol/L 1988-11-30 17:23:25.023 +03A481F5-B32A-4A91-BD42-43EB78FEBA77 1 METABOLIC: CHLORIDE 106.2 mmol/L 1988-11-30 12:58:18.187 +03A481F5-B32A-4A91-BD42-43EB78FEBA77 2 CBC: EOSINOPHILS 0.5 k/cumm 2008-02-20 16:23:57.523 +03A481F5-B32A-4A91-BD42-43EB78FEBA77 2 URINALYSIS: RED BLOOD CELLS 3.2 rbc/hpf 2008-02-20 05:04:37.887 +2A5251B1-0945-47FA-A65C-7A6381562591 1 METABOLIC: ANION GAP 7.1 mmol/L 1962-07-13 05:44:28.937 +2A5251B1-0945-47FA-A65C-7A6381562591 1 CBC: RDW 12 % 1962-07-12 18:08:46.313 +2A5251B1-0945-47FA-A65C-7A6381562591 2 METABOLIC: GLUCOSE 66.3 mg/dL 1994-05-06 16:18:00.470 +2A5251B1-0945-47FA-A65C-7A6381562591 2 CBC: MCHC 31.4 g/dl 1994-05-06 23:08:47.193 +2A5251B1-0945-47FA-A65C-7A6381562591 3 CBC: MCH 39 pg 1998-11-07 00:00:39.330 +2A5251B1-0945-47FA-A65C-7A6381562591 3 METABOLIC: POTASSIUM 4.4 mmol/L 1998-11-07 11:17:53.807 +2A5251B1-0945-47FA-A65C-7A6381562591 4 CBC: BASOPHILS 0.2 k/cumm 2001-02-07 02:29:50.413 +2A5251B1-0945-47FA-A65C-7A6381562591 4 URINALYSIS: RED BLOOD CELLS 1 rbc/hpf 2001-02-07 05:25:03.327 +2A5251B1-0945-47FA-A65C-7A6381562591 5 METABOLIC: CARBON DIOXIDE 20 mmol/L 2001-07-09 04:13:38.770 +2A5251B1-0945-47FA-A65C-7A6381562591 5 CBC: WHITE BLOOD CELL COUNT 4.6 k/cumm 2001-07-09 13:32:21.803 +2A5251B1-0945-47FA-A65C-7A6381562591 6 CBC: LYMPHOCYTES 3 k/cumm 2009-12-05 14:07:31.293 +2A5251B1-0945-47FA-A65C-7A6381562591 6 CBC: WHITE BLOOD CELL COUNT 11.1 k/cumm 2009-12-05 15:05:15.727 +8AF47463-8534-4203-B210-C2290F6CE689 1 URINALYSIS: WHITE BLOOD CELLS 1 wbc/hpf 1974-11-29 13:41:50.587 +8AF47463-8534-4203-B210-C2290F6CE689 1 CBC: MCHC 32.9 g/dl 1974-11-29 11:44:00.513 +8AF47463-8534-4203-B210-C2290F6CE689 2 CBC: MCHC 30 g/dl 1998-03-10 19:38:18.723 +8AF47463-8534-4203-B210-C2290F6CE689 2 CBC: RED BLOOD CELL COUNT 4.7 m/cumm 1998-03-10 12:40:45.757 +8AF47463-8534-4203-B210-C2290F6CE689 3 METABOLIC: BUN 16.8 mg/dL 2005-04-03 03:38:55.020 +8AF47463-8534-4203-B210-C2290F6CE689 3 CBC: MONOCYTES 0.2 k/cumm 2005-04-03 03:14:20.980 +8AF47463-8534-4203-B210-C2290F6CE689 4 CBC: MCH 38 pg 2005-12-31 00:38:02.860 +8AF47463-8534-4203-B210-C2290F6CE689 4 CBC: ABSOLUTE LYMPHOCYTES 16.4 % 2005-12-30 10:48:55.233 +8AF47463-8534-4203-B210-C2290F6CE689 5 CBC: MONOCYTES 1.2 k/cumm 2011-11-20 10:22:14.630 +8AF47463-8534-4203-B210-C2290F6CE689 5 URINALYSIS: WHITE BLOOD CELLS 5.9 wbc/hpf 2011-11-20 18:13:07.407 +135C831F-7DA5-46C0-959C-EBCBD8810B43 1 URINALYSIS: PH 5.4 no unit 1993-04-25 02:22:35.070 +135C831F-7DA5-46C0-959C-EBCBD8810B43 1 URINALYSIS: RED BLOOD CELLS 2 rbc/hpf 1993-04-24 18:09:44.683 +135C831F-7DA5-46C0-959C-EBCBD8810B43 2 METABOLIC: AST/SGOT 33.7 U/L 2001-02-22 01:17:26.200 +135C831F-7DA5-46C0-959C-EBCBD8810B43 2 METABOLIC: CHLORIDE 97.8 mmol/L 2001-02-21 16:52:25.837 +135C831F-7DA5-46C0-959C-EBCBD8810B43 3 CBC: RED BLOOD CELL COUNT 6.4 m/cumm 2002-03-23 06:54:48.527 +135C831F-7DA5-46C0-959C-EBCBD8810B43 3 CBC: LYMPHOCYTES 2.1 k/cumm 2002-03-22 14:25:52.640 +135C831F-7DA5-46C0-959C-EBCBD8810B43 4 METABOLIC: POTASSIUM 5.6 mmol/L 2007-10-05 12:18:25.360 +135C831F-7DA5-46C0-959C-EBCBD8810B43 4 CBC: ABSOLUTE LYMPHOCYTES 29.4 % 2007-10-05 03:51:38.797 +135C831F-7DA5-46C0-959C-EBCBD8810B43 5 CBC: WHITE BLOOD CELL COUNT 6 k/cumm 2010-08-26 09:00:05.610 +135C831F-7DA5-46C0-959C-EBCBD8810B43 5 URINALYSIS: RED BLOOD CELLS 0.6 rbc/hpf 2010-08-26 19:11:27.713 +8856096E-E59C-4156-A767-C091AF799C80 1 CBC: HEMOGLOBIN 15.2 gm/dl 2008-02-11 21:43:57.593 +8856096E-E59C-4156-A767-C091AF799C80 1 METABOLIC: GLUCOSE 130 mg/dL 2008-02-11 21:43:11.500 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 1 URINALYSIS: WHITE BLOOD CELLS 1.5 wbc/hpf 1962-07-17 15:36:06.153 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 1 CBC: LYMPHOCYTES 2.4 k/cumm 1962-07-17 09:08:44.507 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 2 CBC: MCHC 34.7 g/dl 1965-10-02 01:00:55.207 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 2 METABOLIC: CREATININE 1.1 mg/dL 1965-10-02 01:58:00.577 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 3 METABOLIC: ANION GAP 9 mmol/L 1970-04-24 15:33:56.103 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 3 CBC: NEUTROPHILS 4.9 k/cumm 1970-04-24 18:01:02.160 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 4 METABOLIC: SODIUM 146.5 mmol/L 1973-12-24 21:29:32.253 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 4 METABOLIC: CALCIUM 10.4 mg/dL 1973-12-25 08:16:16.373 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 5 URINALYSIS: PH 6.9 no unit 2009-07-02 17:26:40.277 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 5 CBC: HEMATOCRIT 34.6 % 2009-07-02 08:36:56.607 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 1 CBC: WHITE BLOOD CELL COUNT 9.2 k/cumm 1987-03-22 09:31:36.583 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 1 METABOLIC: ALT/SGPT 49.4 U/L 1987-03-22 05:41:07.780 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 2 METABOLIC: ALK PHOS 122.7 U/L 2003-07-10 01:10:26.037 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 2 CBC: EOSINOPHILS 0.4 k/cumm 2003-07-10 19:20:51.407 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 3 CBC: HEMOGLOBIN 16.4 gm/dl 2007-09-24 21:08:27.683 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 3 METABOLIC: CARBON DIOXIDE 26.8 mmol/L 2007-09-25 06:33:09.240 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 4 URINALYSIS: WHITE BLOOD CELLS 1 wbc/hpf 2008-02-13 16:12:36.323 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 4 URINALYSIS: SPECIFIC GRAVITY 1 no unit 2008-02-13 10:03:57.607 +FB909FAE-72DD-4F6F-9828-D92183DF185F 1 METABOLIC: ALBUMIN 4.7 gm/dL 1959-09-01 04:51:11.380 +FB909FAE-72DD-4F6F-9828-D92183DF185F 1 METABOLIC: BUN 25 mg/dL 1959-09-01 03:34:16.077 +FB909FAE-72DD-4F6F-9828-D92183DF185F 2 METABOLIC: ANION GAP 3.3 mmol/L 2005-08-01 03:04:35.110 +FB909FAE-72DD-4F6F-9828-D92183DF185F 2 METABOLIC: BUN 21.2 mg/dL 2005-08-01 09:06:25.167 +FB909FAE-72DD-4F6F-9828-D92183DF185F 3 METABOLIC: CREATININE 1.2 mg/dL 2008-04-14 19:25:44.707 +FB909FAE-72DD-4F6F-9828-D92183DF185F 3 METABOLIC: CALCIUM 10.9 mg/dL 2008-04-14 19:40:28.633 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 1 URINALYSIS: RED BLOOD CELLS 3.1 rbc/hpf 1968-10-07 14:41:30.843 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 1 METABOLIC: ALT/SGPT 57.1 U/L 1968-10-07 15:40:30.880 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 2 CBC: PLATELET COUNT 145.1 k/cumm 1974-06-13 13:31:28.790 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 2 METABOLIC: AST/SGOT 13.9 U/L 1974-06-13 05:20:28.330 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 3 METABOLIC: CARBON DIOXIDE 29.5 mmol/L 2009-11-09 21:35:36.327 +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F 3 CBC: PLATELET COUNT 234.7 k/cumm 2009-11-09 16:42:19.967 +64182B95-EB72-4E2B-BE77-8050B71498CE 1 URINALYSIS: WHITE BLOOD CELLS 4.3 wbc/hpf 1976-08-11 00:48:42.367 +64182B95-EB72-4E2B-BE77-8050B71498CE 1 CBC: NEUTROPHILS 3.4 k/cumm 1976-08-11 06:11:03.133 +64182B95-EB72-4E2B-BE77-8050B71498CE 2 URINALYSIS: RED BLOOD CELLS 0.6 rbc/hpf 1991-06-04 23:31:23.903 +64182B95-EB72-4E2B-BE77-8050B71498CE 2 METABOLIC: SODIUM 126.9 mmol/L 1991-06-05 15:02:25.860 +64182B95-EB72-4E2B-BE77-8050B71498CE 3 METABOLIC: CREATININE 0.7 mg/dL 1994-11-26 07:52:18.590 +64182B95-EB72-4E2B-BE77-8050B71498CE 3 CBC: MCH 24.8 pg 1994-11-26 08:23:19.043 +64182B95-EB72-4E2B-BE77-8050B71498CE 4 CBC: PLATELET COUNT 425.2 k/cumm 2007-08-17 15:27:59.963 +64182B95-EB72-4E2B-BE77-8050B71498CE 4 CBC: RED BLOOD CELL COUNT 4.4 m/cumm 2007-08-17 13:12:35.347 +64182B95-EB72-4E2B-BE77-8050B71498CE 5 METABOLIC: POTASSIUM 5.4 mmol/L 2009-11-24 18:24:26.823 +64182B95-EB72-4E2B-BE77-8050B71498CE 5 METABOLIC: SODIUM 149.1 mmol/L 2009-11-24 13:41:30.843 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 1 CBC: RDW 10.7 % 1998-05-24 23:19:10.220 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 1 CBC: MEAN CORPUSCULAR VOLUME 88.4 fl 1998-05-24 23:24:37.370 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 2 METABOLIC: CHLORIDE 95.2 mmol/L 2000-05-12 21:49:41.893 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 2 METABOLIC: ALK PHOS 97.4 U/L 2000-05-13 00:40:22.007 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 3 CBC: MEAN CORPUSCULAR VOLUME 85.2 fl 2007-12-07 13:40:34.653 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 3 METABOLIC: BILI TOTAL 1.1 mg/dL 2007-12-06 20:55:38.180 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 4 METABOLIC: CHLORIDE 112.3 mmol/L 2010-09-06 01:54:20.287 +DB22A4D9-7E4D-485C-916A-9CD1386507FB 4 METABOLIC: POTASSIUM 4.9 mmol/L 2010-09-06 01:00:54.797 +6E70D84D-C75F-477C-BC37-9177C3698C66 1 CBC: HEMOGLOBIN 10.5 gm/dl 2003-12-18 03:10:23.523 +6E70D84D-C75F-477C-BC37-9177C3698C66 1 METABOLIC: GLUCOSE 92.9 mg/dL 2003-12-18 03:43:15.770 +6E70D84D-C75F-477C-BC37-9177C3698C66 2 METABOLIC: BILI TOTAL 1.1 mg/dL 2005-04-07 13:37:31.000 +6E70D84D-C75F-477C-BC37-9177C3698C66 2 CBC: HEMOGLOBIN 15.6 gm/dl 2005-04-07 14:26:10.870 +6E70D84D-C75F-477C-BC37-9177C3698C66 3 URINALYSIS: PH 5.1 no unit 2006-11-01 15:43:23.893 +6E70D84D-C75F-477C-BC37-9177C3698C66 3 METABOLIC: AST/SGOT 41.4 U/L 2006-11-01 02:47:24.923 +6E70D84D-C75F-477C-BC37-9177C3698C66 4 CBC: MONOCYTES 0.8 k/cumm 2009-10-09 09:48:53.320 +6E70D84D-C75F-477C-BC37-9177C3698C66 4 METABOLIC: CARBON DIOXIDE 29.4 mmol/L 2009-10-08 23:21:02.910w +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 1 URINALYSIS: RED BLOOD CELLS 0.7 rbc/hpf 1944-07-23 19:11:59.500 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 1 CBC: ABSOLUTE LYMPHOCYTES 19.1 % 1944-07-24 11:00:49.943 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 2 CBC: HEMOGLOBIN 12.8 gm/dl 1949-03-20 13:42:47.143 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 2 CBC: NEUTROPHILS 7.4 k/cumm 1949-03-21 08:07:13.703 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 4 CBC: MCH 26.4 pg 2008-05-07 21:10:37.383 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 4 METABOLIC: BILI TOTAL 0.6 mg/dL 2008-05-08 03:17:28.013 +7FD13988-E58A-4A5C-8680-89AC200950FA 1 CBC: NEUTROPHILS 7.4 k/cumm 1988-07-17 00:27:57.830 +7FD13988-E58A-4A5C-8680-89AC200950FA 1 CBC: HEMATOCRIT 34.9 % 1988-07-17 15:04:21.563 +7FD13988-E58A-4A5C-8680-89AC200950FA 2 METABOLIC: CALCIUM 7.2 mg/dL 2001-03-22 09:01:59.460 +7FD13988-E58A-4A5C-8680-89AC200950FA 2 CBC: HEMOGLOBIN 10.7 gm/dl 2001-03-22 06:23:31.697 +7FD13988-E58A-4A5C-8680-89AC200950FA 3 METABOLIC: BUN 18.5 mg/dL 2002-03-05 11:27:21.417 +7FD13988-E58A-4A5C-8680-89AC200950FA 3 URINALYSIS: WHITE BLOOD CELLS 3.1 wbc/hpf 2002-03-05 06:57:16.993 +7FD13988-E58A-4A5C-8680-89AC200950FA 4 METABOLIC: AST/SGOT 37.8 U/L 2011-12-15 12:09:22.823 +7FD13988-E58A-4A5C-8680-89AC200950FA 4 CBC: NEUTROPHILS 7.9 k/cumm 2011-12-15 11:09:59.253 +C60FE675-CA52-4C55-A233-F4B27E94987F 1 CBC: HEMATOCRIT 43.7 % 1979-05-10 18:07:54.200 +C60FE675-CA52-4C55-A233-F4B27E94987F 1 METABOLIC: CARBON DIOXIDE 32.8 mmol/L 1979-05-10 06:44:11.517 +C60FE675-CA52-4C55-A233-F4B27E94987F 2 URINALYSIS: PH 4.6 no unit 2004-07-29 21:03:53.160 +C60FE675-CA52-4C55-A233-F4B27E94987F 2 METABOLIC: ALK PHOS 88.5 U/L 2004-07-29 18:16:12.760 +C60FE675-CA52-4C55-A233-F4B27E94987F 3 METABOLIC: AST/SGOT 31.2 U/L 2005-03-14 12:33:11.133 +C60FE675-CA52-4C55-A233-F4B27E94987F 3 CBC: MCHC 28.2 g/dl 2005-03-13 18:12:30.003 +C60FE675-CA52-4C55-A233-F4B27E94987F 4 METABOLIC: CHLORIDE 107.3 mmol/L 2011-07-21 17:50:37.447 +C60FE675-CA52-4C55-A233-F4B27E94987F 4 CBC: RDW 16.7 % 2011-07-21 17:31:42.373 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 1 METABOLIC: CARBON DIOXIDE 23.8 mmol/L 1959-05-01 02:49:26.257 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 1 METABOLIC: BUN 24.7 mg/dL 1959-05-01 02:52:39.013 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 2 METABOLIC: GLUCOSE 102.9 mg/dL 1977-01-11 19:04:56.247 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 2 CBC: MCHC 31 g/dl 1977-01-11 18:05:49.543 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 3 METABOLIC: CHLORIDE 109.1 mmol/L 2001-12-20 04:33:50.230 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 3 CBC: ABSOLUTE LYMPHOCYTES 27.6 % 2001-12-20 02:23:48.080 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 4 METABOLIC: GLUCOSE 115.6 mg/dL 2004-06-16 21:44:19.297 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 4 METABOLIC: CALCIUM 11.9 mg/dL 2004-06-17 05:14:08.067 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 5 METABOLIC: ALBUMIN 2.6 gm/dL 2009-11-17 20:12:06.783 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 5 URINALYSIS: WHITE BLOOD CELLS 5.8 wbc/hpf 2009-11-17 17:18:27.450 +FA157FA5-F488-4884-BF87-E144630D595C 1 URINALYSIS: RED BLOOD CELLS 3 rbc/hpf 1952-11-12 17:49:14.793 +FA157FA5-F488-4884-BF87-E144630D595C 1 METABOLIC: ALT/SGPT 16.3 U/L 1952-11-12 14:21:03.960 +FA157FA5-F488-4884-BF87-E144630D595C 2 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1956-06-17 15:11:54.910 +FA157FA5-F488-4884-BF87-E144630D595C 2 METABOLIC: GLUCOSE 117.9 mg/dL 1956-06-17 06:43:39.720 +FA157FA5-F488-4884-BF87-E144630D595C 3 METABOLIC: ALBUMIN 4.9 gm/dL 2004-10-27 01:19:58.527 +FA157FA5-F488-4884-BF87-E144630D595C 3 METABOLIC: CHLORIDE 109.7 mmol/L 2004-10-26 22:02:32.057 +FA157FA5-F488-4884-BF87-E144630D595C 4 CBC: EOSINOPHILS 0.5 k/cumm 2006-11-18 15:17:28.287 +FA157FA5-F488-4884-BF87-E144630D595C 4 METABOLIC: CHLORIDE 105.4 mmol/L 2006-11-18 20:07:12.900 +FA157FA5-F488-4884-BF87-E144630D595C 5 METABOLIC: ALK PHOS 42.8 U/L 2011-05-31 13:59:55.027 +FA157FA5-F488-4884-BF87-E144630D595C 5 CBC: EOSINOPHILS 0.5 k/cumm 2011-05-31 20:23:32.607 +B7E9FC4C-5182-4A34-954E-CEF5FC07E96D 1 METABOLIC: BUN 19.8 mg/dL 2013-07-06 10:06:51.970 +B7E9FC4C-5182-4A34-954E-CEF5FC07E96D 1 CBC: MEAN CORPUSCULAR VOLUME 75.3 fl 2013-07-06 10:08:30.343 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 1 CBC: ABSOLUTE LYMPHOCYTES 16.9 % 1974-09-30 19:47:22.843 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 1 CBC: MCHC 33.1 g/dl 1974-09-30 16:27:08.007 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 2 METABOLIC: CHLORIDE 107.2 mmol/L 1975-04-18 16:58:30.457 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 2 METABOLIC: ALT/SGPT 26.2 U/L 1975-04-18 12:44:16.350 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 3 CBC: HEMOGLOBIN 11.2 gm/dl 1991-07-09 19:36:26.263 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 3 CBC: BASOPHILS 0 k/cumm 1991-07-09 19:24:31.737 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 4 METABOLIC: BUN 7.7 mg/dL 2005-05-01 02:46:18.737 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 4 METABOLIC: GLUCOSE 75.4 mg/dL 2005-05-01 09:59:33.473 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 5 METABOLIC: ALBUMIN 3.4 gm/dL 2011-12-19 01:44:21.437 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 5 CBC: MEAN CORPUSCULAR VOLUME 96.7 fl 2011-12-18 20:27:15.387 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 1 CBC: NEUTROPHILS 8.9 k/cumm 1950-12-21 02:09:43.990 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 1 CBC: LYMPHOCYTES 0.7 k/cumm 1950-12-20 20:03:56.277 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 2 METABOLIC: BILI TOTAL 0.6 mg/dL 1980-02-24 09:10:18.603 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 2 METABOLIC: BUN 14.3 mg/dL 1980-02-24 05:43:05.963 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 3 METABOLIC: BUN 24.8 mg/dL 2004-03-07 14:45:58.107 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 3 CBC: PLATELET COUNT 389.2 k/cumm 2004-03-07 10:16:36.523 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 4 CBC: ABSOLUTE NEUTROPHILS 77.9 % 2007-09-01 19:06:26.167 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 4 METABOLIC: AST/SGOT 13.2 U/L 2007-09-01 20:06:07.123 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 5 URINALYSIS: RED BLOOD CELLS 3.2 rbc/hpf 2012-12-05 22:26:27.060 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D 5 METABOLIC: CARBON DIOXIDE 22.3 mmol/L 2012-12-05 21:18:06.617 +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 1 METABOLIC: ALT/SGPT 52.9 U/L 2007-03-21 23:58:23.087 +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 1 METABOLIC: ALK PHOS 131.6 U/L 2007-03-21 12:01:43.630 +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 2 CBC: RDW 9.3 % 2010-03-19 22:22:57.703 +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 2 METABOLIC: POTASSIUM 4.3 mmol/L 2010-03-20 18:44:49.117 +7C788499-7798-484B-A027-9FCDC4C0DADB 1 CBC: RED BLOOD CELL COUNT 5.3 m/cumm 1953-07-02 05:23:47.217 +7C788499-7798-484B-A027-9FCDC4C0DADB 1 METABOLIC: CREATININE 1.1 mg/dL 1953-07-02 08:36:47.883 +7C788499-7798-484B-A027-9FCDC4C0DADB 2 CBC: MONOCYTES 0.5 k/cumm 2003-10-11 18:52:02.643 +7C788499-7798-484B-A027-9FCDC4C0DADB 2 METABOLIC: ALT/SGPT 72.8 U/L 2003-10-11 04:59:19.790 +7C788499-7798-484B-A027-9FCDC4C0DADB 3 CBC: ABSOLUTE NEUTROPHILS 64.9 % 2008-08-17 18:49:14.290 +7C788499-7798-484B-A027-9FCDC4C0DADB 3 CBC: MONOCYTES 0.9 k/cumm 2008-08-18 00:23:07.543 +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 1 METABOLIC: BILI TOTAL 0.5 mg/dL 1994-09-10 15:26:23.323 +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 1 CBC: MONOCYTES 0.7 k/cumm 1994-09-10 19:28:51.887 +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 2 METABOLIC: GLUCOSE 130.8 mg/dL 2010-04-06 14:00:25.200 +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 2 CBC: MONOCYTES 0.7 k/cumm 2010-04-06 08:24:33.030 +6985D824-3269-4D12-A9DD-B932D640E26E 1 CBC: WHITE BLOOD CELL COUNT 11.8 k/cumm 1990-11-18 21:19:56.887 +6985D824-3269-4D12-A9DD-B932D640E26E 1 CBC: ABSOLUTE NEUTROPHILS 67.3 % 1990-11-18 12:41:55.090 +6985D824-3269-4D12-A9DD-B932D640E26E 2 CBC: MEAN CORPUSCULAR VOLUME 77.5 fl 2012-12-07 04:19:34.797 +6985D824-3269-4D12-A9DD-B932D640E26E 2 CBC: MCH 24.6 pg 2012-12-07 12:01:59.287 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 1 CBC: RDW 16.7 % 1973-11-21 06:19:22.020 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 1 METABOLIC: TOTAL PROTEIN 7 gm/dL 1973-11-20 13:54:18.637 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 2 METABOLIC: GLUCOSE 129.2 mg/dL 1988-09-25 18:47:41.290 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 2 METABOLIC: ALBUMIN 5.2 gm/dL 1988-09-26 12:57:04.700 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 3 CBC: HEMATOCRIT 39.4 % 1997-06-19 18:24:25.777 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 3 METABOLIC: BUN 25.7 mg/dL 1997-06-19 20:00:57.547 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 4 URINALYSIS: WHITE BLOOD CELLS 4.2 wbc/hpf 2000-08-14 13:36:22.807 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 4 METABOLIC: CARBON DIOXIDE 23.1 mmol/L 2000-08-14 07:09:53.250 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 5 CBC: ABSOLUTE NEUTROPHILS 79.5 % 2012-02-19 00:17:16.817 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C 5 METABOLIC: BUN 12.8 mg/dL 2012-02-18 07:15:01.923 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 1 METABOLIC: CREATININE 1.1 mg/dL 1997-06-14 04:57:43.853 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 1 METABOLIC: TOTAL PROTEIN 5.2 gm/dL 1997-06-14 02:18:13.227 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 2 METABOLIC: AST/SGOT 29.5 U/L 2007-09-13 20:50:32.720 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 2 CBC: RDW 14.9 % 2007-09-13 21:12:55.613 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 3 METABOLIC: SODIUM 143.3 mmol/L 2009-12-02 22:22:06.593 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 3 METABOLIC: AST/SGOT 38.4 U/L 2009-12-02 19:34:06.340 +25B786AF-0F99-478C-9CFA-0EA607E45834 1 CBC: RDW 15.4 % 1945-10-19 08:14:37.050 +25B786AF-0F99-478C-9CFA-0EA607E45834 1 CBC: BASOPHILS 0 k/cumm 1945-10-19 03:57:26.823 +25B786AF-0F99-478C-9CFA-0EA607E45834 2 METABOLIC: CALCIUM 8.8 mg/dL 1977-09-23 19:21:37.600 +25B786AF-0F99-478C-9CFA-0EA607E45834 2 METABOLIC: SODIUM 152.7 mmol/L 1977-09-23 14:58:32.100 +25B786AF-0F99-478C-9CFA-0EA607E45834 3 METABOLIC: GLUCOSE 86.9 mg/dL 1988-07-29 14:05:52.657 +25B786AF-0F99-478C-9CFA-0EA607E45834 3 METABOLIC: ALBUMIN 5.1 gm/dL 1988-07-29 18:11:01.920 +25B786AF-0F99-478C-9CFA-0EA607E45834 4 METABOLIC: AST/SGOT 33.4 U/L 2004-09-14 09:01:00.737 +25B786AF-0F99-478C-9CFA-0EA607E45834 4 CBC: MCHC 30 g/dl 2004-09-14 08:07:00.330 +25B786AF-0F99-478C-9CFA-0EA607E45834 5 METABOLIC: GLUCOSE 136 mg/dL 2006-03-14 17:02:23.283 +25B786AF-0F99-478C-9CFA-0EA607E45834 5 CBC: EOSINOPHILS 0.4 k/cumm 2006-03-14 16:32:35.153 +25B786AF-0F99-478C-9CFA-0EA607E45834 6 METABOLIC: TOTAL PROTEIN 9.8 gm/dL 2006-05-23 12:37:13.087 +25B786AF-0F99-478C-9CFA-0EA607E45834 6 URINALYSIS: PH 5.5 no unit 2006-05-23 15:10:46.120 +25B786AF-0F99-478C-9CFA-0EA607E45834 7 METABOLIC: BILI TOTAL 0.3 mg/dL 2009-03-13 15:13:31.400 +25B786AF-0F99-478C-9CFA-0EA607E45834 7 CBC: WHITE BLOOD CELL COUNT 3.5 k/cumm 2009-03-13 09:40:53.837 +F00C64F8-2033-4640-80FE-F1F62CBE26A5 1 METABOLIC: BUN 22.7 mg/dL 1983-03-14 19:32:41.103 +F00C64F8-2033-4640-80FE-F1F62CBE26A5 1 CBC: ABSOLUTE NEUTROPHILS 70.2 % 1983-03-14 20:30:26.020 +F00C64F8-2033-4640-80FE-F1F62CBE26A5 2 METABOLIC: CALCIUM 7.1 mg/dL 2008-01-11 03:40:22.073 +F00C64F8-2033-4640-80FE-F1F62CBE26A5 2 URINALYSIS: WHITE BLOOD CELLS 1.8 wbc/hpf 2008-01-11 07:28:15.013 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 1 METABOLIC: ANION GAP 17.9 mmol/L 1982-11-09 19:05:43.380 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 1 URINALYSIS: SPECIFIC GRAVITY 1 no unit 1982-11-09 11:46:58.047 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 2 CBC: MCH 31.7 pg 1986-07-16 01:54:11.807 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 2 CBC: MONOCYTES 0.2 k/cumm 1986-07-15 13:39:25.513 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 3 CBC: BASOPHILS 0.1 k/cumm 1999-10-26 14:12:46.643 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 3 CBC: MEAN CORPUSCULAR VOLUME 92.5 fl 1999-10-26 11:51:25.537 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 4 URINALYSIS: RED BLOOD CELLS 2.3 rbc/hpf 2008-06-03 23:00:45.840 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 4 URINALYSIS: WHITE BLOOD CELLS 0.1 wbc/hpf 2008-06-04 06:32:18.133 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 1 METABOLIC: CHLORIDE 99.2 mmol/L 1968-10-07 00:14:47.893 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 1 CBC: PLATELET COUNT 398.3 k/cumm 1968-10-07 07:46:12.267 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 2 METABOLIC: BILI TOTAL 1.1 mg/dL 1996-09-10 11:02:25.030 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 2 METABOLIC: AST/SGOT 33.8 U/L 1996-09-10 13:06:00.987 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 3 METABOLIC: BUN 28.3 mg/dL 2002-09-04 14:34:10.830 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 3 CBC: HEMATOCRIT 30.1 % 2002-09-05 13:22:48.157 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 4 METABOLIC: POTASSIUM 3.5 mmol/L 2002-09-24 22:31:16.253 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 4 CBC: HEMATOCRIT 48.1 % 2002-09-25 15:45:09.530 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 5 CBC: ABSOLUTE LYMPHOCYTES 18.1 % 2007-03-22 15:01:48.777 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 5 CBC: NEUTROPHILS 2.6 k/cumm 2007-03-23 03:06:09.610 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 6 METABOLIC: GLUCOSE 63.3 mg/dL 2012-04-21 02:50:04.503 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A 6 CBC: MCHC 38.6 g/dl 2012-04-21 03:27:10.293 diff --git a/uml2es/examples/patient-hub/datasets/patients-core/PatientsCorePopulatedTable.txt b/uml2es/examples/patient-hub/datasets/patients-core/PatientsCorePopulatedTable.txt new file mode 100755 index 0000000..7742cc3 --- /dev/null +++ b/uml2es/examples/patient-hub/datasets/patients-core/PatientsCorePopulatedTable.txt @@ -0,0 +1,101 @@ +PatientID PatientGender PatientDateOfBirth PatientRace PatientMaritalStatus PatientLanguage PatientPopulationPercentageBelowPoverty +FB2ABB23-C9D0-4D09-8464-49BF0B982F0F Male 1947-12-28 02:45:40.547 Unknown Married Icelandic 18.08 +64182B95-EB72-4E2B-BE77-8050B71498CE Male 1952-01-18 19:51:12.917 African American Separated English 13.03 +DB22A4D9-7E4D-485C-916A-9CD1386507FB Female 1970-07-25 13:04:20.717 Asian Married English 6.67 +6E70D84D-C75F-477C-BC37-9177C3698C66 Male 1979-01-04 05:45:29.580 White Married English 16.09 +C8556CC0-32FC-4CA5-A8CD-9CCF38816167 Female 1921-04-11 11:39:49.197 White Married English 18.2 +7FD13988-E58A-4A5C-8680-89AC200950FA Male 1965-07-12 15:41:20.523 White Married Spanish 12.41 +C60FE675-CA52-4C55-A233-F4B27E94987F Male 1957-10-30 23:26:15.303 Asian Married Spanish 12.8 +B39DC5AC-E003-4E6A-91B6-FC07625A1285 Female 1935-11-03 21:07:09.040 White Married English 15.31 +FA157FA5-F488-4884-BF87-E144630D595C Female 1932-11-01 06:19:56.577 White Single English 16.32 +B7E9FC4C-5182-4A34-954E-CEF5FC07E96D Female 1985-12-11 02:48:16.907 Unknown Single English 11.43 +1A40AF35-C6D4-4D46-B475-A15D84E8A9D5 Male 1949-01-10 15:37:35.543 White Married English 11.25 +DA6CECFF-DE13-4C4C-919F-64E1A2B76C9D Male 1924-06-27 19:37:58.823 Asian Divorced English 83.75 +0A9BA3E4-CF3C-49C4-9774-5EEA2EE7D123 Male 1980-04-04 07:59:15.820 White Single Spanish 14.28 +7C788499-7798-484B-A027-9FCDC4C0DADB Male 1926-08-13 10:22:16.247 White Married English 11.89 +C54B5AAD-98E8-472D-BAA0-638D9F3BD024 Female 1972-11-13 22:50:43.600 African American Single Unknown 94 +6985D824-3269-4D12-A9DD-B932D640E26E Female 1967-10-27 03:58:29.027 White Married English 12.01 +D8B53AA2-7953-4477-9EA4-68400EBAAC5C Male 1951-06-11 20:11:10.003 African American Unknown English 16.89 +DB92CDC6-FA9B-4492-BC2C-0C588AD78956 Male 1977-06-30 01:46:05.467 Unknown Single Icelandic 1.7 +25B786AF-0F99-478C-9CFA-0EA607E45834 Male 1926-08-20 00:21:38.870 White Married English 93.6 +F00C64F8-2033-4640-80FE-F1F62CBE26A5 Female 1957-06-04 18:31:01.177 African American Single English 15.72 +B70E5A76-F2BC-41E4-B037-CD4D9ABA0967 Male 1962-12-15 01:59:01.737 White Single Icelandic 13.1 +F0B53A2C-98CA-415D-B928-E3FD0E52B22A Male 1950-06-20 10:31:18.337 African American Married English 14.87 +1A8791E3-A61C-455A-8DEE-763EB90C9B2C Male 1973-08-16 10:58:34.413 Asian Single English 13.97 +81C5B13B-F6B2-4E57-9593-6E7E4C13B2CE Female 1930-05-28 02:59:42.857 White Married Icelandic 19.22 +220C8D43-1322-4A9D-B890-D426942A3649 Male 1971-03-13 18:31:24.877 Asian Married English 16.71 +C242E3A4-E785-4DF1-A0E4-3B568DC88F2E Male 1963-02-23 21:46:28.840 Asian Single Spanish 7.59 +0BC491C5-5A45-4067-BD11-A78BEA00D3BE Female 1921-04-18 01:56:01.807 Unknown Married English 18.05 +79A7BA2A-D35A-4CB8-A835-6BAA13B0058C Female 1952-05-03 02:30:21.563 White Single Spanish 16.24 +FFCDECD6-4048-4DCB-B910-1218160005B3 Male 1941-05-06 14:56:42.687 White Single English 14.49 +CD2ADB1B-97F7-4EF6-BC5C-3E0EC562A06F Female 1963-04-16 08:54:08.647 White Single Icelandic 11.16 +A50BE9B4-8A0B-4169-B894-F7BD86D7D90B Female 1987-04-18 16:31:16.333 Asian Divorced English 14.07 +69CC25ED-A54A-4BAF-97E3-774BB3C9DED1 Female 1974-10-13 14:51:28.997 Unknown Married English 17.72 +69B5D2A0-12FD-46EF-A5FF-B29C4BAFBE49 Male 1954-05-02 16:38:15.957 White Married English 18.65 +8D389A8C-A6D8-4447-9DDE-1A28AB4EC667 Female 1964-07-10 08:50:13.707 Asian Married English 4.34 +967987B9-FFEF-4776-85CF-AE05CA81F583 Male 1947-02-13 10:26:55.520 White Widowed English 88.66 +9BBF3A51-443D-438B-9289-B98B8E0577C0 Male 1944-11-25 06:12:56.860 White Married English 16.76 +6D8008ED-D623-4BE4-B93B-335F9797C170 Female 1978-03-14 13:41:28.337 White Married Icelandic 14.81 +B3892204-880B-40EF-B3BB-B824B50E99E5 Male 1978-08-06 08:38:27.330 White Single Spanish 16.86 +49DADA25-F2C2-42BB-8210-D78E6C7B0D48 Male 1962-04-08 10:18:26.263 African American Married English 19.5 +7548B6CF-79D9-461D-A0C5-20B861406FAC Male 1956-11-13 14:08:00.253 White Married Icelandic 14.03 +B5D31F01-7273-4901-B56F-8139769A11EF Female 1971-04-02 18:56:59.353 Asian Unknown Unknown 82.08 +80D356B4-F974-441F-A5F2-F95986D119A2 Female 1938-03-06 18:24:18.297 White Single English 18.88 +A0A976C8-9B30-4492-B8C4-5B25095B9192 Male 1931-05-26 14:54:15.847 Asian Single English 19.52 +016A590E-D093-4667-A5DA-D68EA6987D93 Male 1960-12-06 06:37:05.640 White Unknown English 15.02 +3B11D6B3-A36A-4B69-A437-C29BF425A941 Female 1954-05-18 10:19:19.110 Asian Separated English 10.8 +E483DE6E-D4E6-47FD-905B-22EE86EC7ACE Male 1945-11-18 04:14:31.573 African American Single English 16.88 +B2EB15FA-5431-4804-9309-4215BDC778C0 Male 1951-04-13 20:14:02.953 White Divorced English 19.41 +53B9FFDD-F80B-43BE-93CF-C34A023EE7E9 Male 1921-08-22 19:17:09.227 White Divorced Icelandic 18.17 +C5D09468-574F-4802-B56F-DB38F4EB1687 Male 1939-07-07 19:39:49.753 African American Married Icelandic 10.87 +EA7C2F0F-DA1C-4CE8-9700-4BB1FC7AF3FB Male 1969-01-05 00:15:09.627 Unknown Married English 3.3 +35FE7491-1A1D-48CB-810C-8DC2599AB3DD Male 1969-11-02 06:34:34.527 White Married English 4.51 +868E700E-3C56-458F-A477-078D671DCB20 Female 1978-09-21 15:29:44.770 African American Married Icelandic 5.94 +56A35E74-90BE-44A0-B7BA-7743BB152133 Female 1968-11-09 15:29:19.557 White Married English 8.81 +CC12B481-B516-455B-884F-4CA900B29F2E Female 1985-10-21 07:59:04.777 Unknown Divorced English 14.58 +714823AF-C52C-414C-B53B-C43EACD194C3 Male 1952-05-08 23:51:50.127 White Married English 13.23 +3231F930-2978-4F50-8234-755449851E7B Male 1979-05-26 04:58:10.627 White Single English 18.36 +C2CCB1AB-6633-4CB3-B4E8-157E6FB02376 Female 1964-05-07 10:20:37.740 White Single Spanish 15.98 +1311FEE4-2FDC-46E4-83D3-1550A3E51D2C Female 1988-03-28 03:09:22.807 White Single English 14.99 +21792512-2D40-4326-BEA2-A40127EB24FF Male 1938-03-24 19:25:53.980 White Single Unknown 89.44 +EEAFC0B3-B835-4D99-AB33-2F9428E54E5F Female 1961-01-08 15:19:15.490 Asian Unknown English 18.95 +2EE42DEF-37CA-4694-827E-FA4EAF882BFC Male 1964-04-27 00:41:40.410 White Married English 18.91 +36775002-9EC3-4889-AD4F-80DC6855C8D8 Female 1963-07-16 22:16:48.477 Asian Single Spanish 15.56 +4C201C71-CCED-40D1-9642-F9C8C485B854 Male 1926-09-22 09:17:14.713 African American Married English 10.3 +2A8772FE-61DB-483E-B6BF-6C0A74BA9C2A Female 1966-10-14 15:31:48.427 Asian Single English 11.15 +C65A4ADE-112E-49E4-B72A-0DED22C242ED Male 1955-04-07 18:55:17.077 White Married English 19.66 +80AC01B2-BD55-4BE0-A59A-4024104CF4E9 Female 1965-05-14 15:25:09.740 African American Married English 19.74 +6A57AC0C-57F3-4C19-98A1-51135EFBC4FF Female 1958-07-07 16:00:19.383 Unknown Married English 94.06 +7A025E77-7832-4F53-B9A7-09A3F98AC17E Female 1951-07-12 08:23:45.520 Asian Single English 16.69 +DCE5AEB8-6DB9-4106-8AE4-02CCC5C23741 Female 1967-11-09 08:14:51.143 White Single Unknown 16.43 +886B5885-1EE2-49F3-98D5-A2F02EB8A9D4 Female 1970-04-27 09:15:11.080 Unknown Married English 10.35 +0E0EADE8-5592-4E0B-9F88-D7596E32EE08 Female 1942-07-13 21:15:37.517 White Married Spanish 18.8 +0681FA35-A794-4684-97BD-00B88370DB41 Female 1978-10-02 21:46:05.300 Asian Unknown Spanish 19.16 +2E26695A-EFB0-4C7F-9318-E3030B154E39 Female 1963-06-28 05:37:36.843 Asian Married English 14.2 +DDC0BC57-7A4E-4E02-9282-177750B74FBC Male 1921-03-26 14:38:51.803 White Single English 18.41 +E250799D-F6DE-4914-ADB4-B08A6E5029B9 Female 1945-08-04 19:03:00.757 White Single Unknown 12.86 +9C75DF1F-9DA6-4C98-8F5B-E10BDC805ED0 Female 1952-07-19 13:35:56.833 White Divorced English 88.65 +A19A0B00-4C9A-4206-B1FE-17E6DA3CEB0B Female 1967-07-01 01:44:24.907 Unknown Married English 17.84 +E5478913-6819-4977-BB11-4C8B61175B56 Female 1980-03-21 13:08:56.867 White Single English 12.92 +66154E24-D3EE-4311-89DB-6195278F9B3C Female 1944-08-26 13:03:24.297 White Divorced English 19.49 +BC44CE19-9FC5-4AC9-A296-9EBC5E3D03AE Female 1953-06-04 03:16:17.843 African American Married English 15.04 +CC9CDA72-B37A-4F8F-AFE4-B08F56A183BE Female 1942-04-14 14:01:01.130 Asian Married Spanish 14.15 +EA9B67E2-15F0-450B-A8A6-14F6E4AE3D12 Female 1930-04-08 20:59:31.057 Asian Separated Icelandic 98.4 +3E462A8F-7B90-43A1-A8B6-AD82CB5002C9 Female 1986-12-20 16:41:34.793 White Married Spanish 18.33 +9E18822E-7D13-45C7-B50E-F95CFF92BC3E Male 1954-10-16 06:45:56.257 Unknown Single English 15.24 +A7142B71-A144-4D56-BD14-3E966B01DB37 Male 1960-03-28 13:40:52.270 White Divorced Spanish 19.52 +FE0B9B59-1927-45B7-8556-E079DC1DE30A Male 1955-08-23 01:01:22.260 White Divorced English 6.48 +98F593D2-8894-49BB-93B9-5A0E2CF85E2E Female 1944-07-15 19:04:11.487 African American Married English 9.1 +1A220558-5996-43E1-AE5D-7B96180FED35 Male 1937-09-07 22:23:53.143 Asian Married English 15.11 +7A7332AD-88B1-4848-9356-E5260E477C59 Female 1944-12-01 06:30:01.543 Unknown Married English 19.46 +6D5DCAC1-17FE-4D7C-923B-806EFBA3E6DF Male 1961-10-22 02:47:13.170 Asian Married English 13.9 +36E2F89E-777A-4D77-9D95-0D70A8AB416F Male 1980-05-30 13:23:50.703 African American Separated English 19.36 +672D554B-D6D1-40B2-A6A4-21A4CB6B1AA6 Male 1983-06-17 04:46:13.753 African American Single Icelandic 11.04 +03A481F5-B32A-4A91-BD42-43EB78FEBA77 Female 1968-02-07 23:02:38.017 Asian Single Unknown 93.23 +2A5251B1-0945-47FA-A65C-7A6381562591 Female 1942-01-07 16:45:33.060 Unknown Married Spanish 18.05 +8AF47463-8534-4203-B210-C2290F6CE689 Female 1952-06-27 17:29:04.187 White Divorced English 11.88 +135C831F-7DA5-46C0-959C-EBCBD8810B43 Male 1971-05-13 04:40:05.623 White Unknown Spanish 12.38 +8856096E-E59C-4156-A767-C091AF799C80 Female 1988-11-25 02:59:36.373 White Divorced English 11.08 +6623F5D6-D581-4268-9F9B-21612FBBF7B5 Female 1943-02-17 15:36:13.787 Asian Single Spanish 14.49 +65A7FBE0-EA9F-49E9-9824-D8F3AD98DAC0 Female 1962-11-30 06:28:33.110 White Separated Spanish 17.98 +FB909FAE-72DD-4F6F-9828-D92183DF185F Male 1940-07-15 12:18:41.080 White Single Spanish 14.9 diff --git a/uml2es/examples/patient-hub/entities_fromDHFExample/Admissions.entity.json b/uml2es/examples/patient-hub/entities_fromDHFExample/Admissions.entity.json new file mode 100755 index 0000000..3eca0e4 --- /dev/null +++ b/uml2es/examples/patient-hub/entities_fromDHFExample/Admissions.entity.json @@ -0,0 +1,84 @@ +{ + "info" : { + "title" : "Admissions", + "version" : "0.0.1", + "baseUri" : "http://www.example.org/" + }, + "definitions" : { + "Labs" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "name" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "value" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "units" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "datetime" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + } + } + }, + "Admissions" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ "AdmissionID" ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "AdmissionID" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "startdate" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "enddate" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "labs" : { + "datatype" : "array", + "items" : { + "$ref" : "#/definitions/Labs" + } + }, + "diagnoses" : { + "datatype" : "array", + "items" : { + "$ref" : "#/definitions/Diagnoses" + } + } + } + }, + "Diagnoses" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "primaryDiagnosisCode" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "primaryDiagnosisDescription" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + } + } + } + } +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/entities_fromDHFExample/Diagnoses.entity.json b/uml2es/examples/patient-hub/entities_fromDHFExample/Diagnoses.entity.json new file mode 100755 index 0000000..72a3a33 --- /dev/null +++ b/uml2es/examples/patient-hub/entities_fromDHFExample/Diagnoses.entity.json @@ -0,0 +1,26 @@ +{ + "info" : { + "title" : "Diagnoses", + "version" : "0.0.1", + "baseUri" : "http://example.org/" + }, + "definitions" : { + "Diagnoses" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "primaryDiagnosisCode" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "primaryDiagnosisDescription" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + } + } + } + } +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/entities_fromDHFExample/Labs.entity.json b/uml2es/examples/patient-hub/entities_fromDHFExample/Labs.entity.json new file mode 100755 index 0000000..832ce03 --- /dev/null +++ b/uml2es/examples/patient-hub/entities_fromDHFExample/Labs.entity.json @@ -0,0 +1,35 @@ +{ + "info" : { + "title" : "Labs", + "version" : "0.0.1", + "baseUri" : "http://example.org/", + "description" : "Labs that were run" + }, + "definitions" : { + "Labs" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "name" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "value" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "units" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "datetime" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + } + } + } + } +} diff --git a/uml2es/examples/patient-hub/entities_fromDHFExample/Patients.entity.json b/uml2es/examples/patient-hub/entities_fromDHFExample/Patients.entity.json new file mode 100755 index 0000000..6922b64 --- /dev/null +++ b/uml2es/examples/patient-hub/entities_fromDHFExample/Patients.entity.json @@ -0,0 +1,127 @@ +{ + "info" : { + "title" : "Patients", + "version" : "0.0.1", + "baseUri" : "http://example.org/", + "description" : "Patient Model" + }, + "definitions" : { + "Labs" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "name" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "value" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "units" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "datetime" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + } + } + }, + "Admissions" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ "AdmissionID" ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "AdmissionID" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "startdate" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "enddate" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "labs" : { + "datatype" : "array", + "items" : { + "$ref" : "#/definitions/Labs" + } + }, + "diagnoses" : { + "datatype" : "array", + "items" : { + "$ref" : "#/definitions/Diagnoses" + } + } + } + }, + "Patients" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ "PatientID" ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "PatientID" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "gender" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "dob" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "race" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "marital-status" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "language" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "percentagebelowpoverty" : { + "datatype" : "decimal" + }, + "admissions" : { + "datatype" : "array", + "items" : { + "$ref" : "#/definitions/Admissions" + } + } + } + }, + "Diagnoses" : { + "required" : [ ], + "pii" : [ ], + "elementRangeIndex" : [ ], + "rangeIndex" : [ ], + "wordLexicon" : [ ], + "properties" : { + "primaryDiagnosisCode" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + }, + "primaryDiagnosisDescription" : { + "datatype" : "string", + "collation" : "http://marklogic.com/collation/codepoint" + } + } + } + } +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/flows/Admissions.flow.json b/uml2es/examples/patient-hub/flows/Admissions.flow.json new file mode 100755 index 0000000..f048fcf --- /dev/null +++ b/uml2es/examples/patient-hub/flows/Admissions.flow.json @@ -0,0 +1,60 @@ +{ + "name" : "Admissions", + "description" : "", + "batchSize" : 100, + "threadCount" : 4, + "stopOnError" : false, + "options" : { }, + "version" : 0, + "steps" : { + "1" : { + "name" : "AdmissionsCore", + "description" : "", + "options" : { + "additionalCollections" : [ ], + "headers" : { + "sources" : [ { + "name" : "Admissions" + } ], + "createdOn" : "currentDateTime", + "createdBy" : "currentUser" + }, + "sourceQuery" : "cts.collectionQuery([])", + "collections" : [ "AdmissionsCore" ], + "permissions" : "rest-reader,read,rest-writer,update", + "outputFormat" : "json", + "targetDatabase" : "xmi2es-examples-patient-hub-STAGING" + }, + "customHook" : { }, + "retryLimit" : 0, + "batchSize" : 0, + "threadCount" : 0, + "stepDefinitionName" : "default-ingestion", + "stepDefinitionType" : "INGESTION", + "fileLocations" : { + "inputFilePath" : "datasets/admissions-core", + "inputFileType" : "csv", + "outputURIReplacement" : ".*datasets,'/datasets'", + "separator" : "\\t" + } + }, + "2" : { + "name" : "BuildAdmissions", + "description" : "", + "options" : { + "sourceQuery" : "cts.collectionQuery([\"AdmissionsCore\"])", + "targetEntity" : "Admissions", + "collections" : [ "BuildAdmissions", "CompletedAdmissions" ], + "sourceDatabase" : "xmi2es-examples-patient-hub-STAGING", + "outputFormat" : "json", + "targetDatabase" : "xmi2es-examples-patient-hub-STAGING" + }, + "customHook" : null, + "retryLimit" : 0, + "batchSize" : 5, + "threadCount" : 12, + "stepDefinitionName" : "BuildAdmissions", + "stepDefinitionType" : "CUSTOM" + } + } +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/flows/Diagnoses.flow.json b/uml2es/examples/patient-hub/flows/Diagnoses.flow.json new file mode 100755 index 0000000..cd5389b --- /dev/null +++ b/uml2es/examples/patient-hub/flows/Diagnoses.flow.json @@ -0,0 +1,42 @@ +{ + "name" : "Diagnoses", + "description" : "and the diagnosis is!!!!!", + "batchSize" : 100, + "threadCount" : 4, + "stopOnError" : false, + "options" : { }, + "version" : 0, + "steps" : { + "1" : { + "name" : "DiagnosesCore", + "description" : "fun", + "options" : { + "additionalCollections" : [ ], + "headers" : { + "sources" : [ { + "name" : "Diagnoses" + } ], + "createdOn" : "currentDateTime", + "createdBy" : "currentUser" + }, + "sourceQuery" : "cts.collectionQuery([])", + "collections" : [ "DiagnosesCore" ], + "permissions" : "rest-reader,read,rest-writer,update", + "outputFormat" : "json", + "targetDatabase" : "xmi2es-examples-patient-hub-STAGING" + }, + "customHook" : { }, + "retryLimit" : 0, + "batchSize" : 0, + "threadCount" : 0, + "stepDefinitionName" : "default-ingestion", + "stepDefinitionType" : "INGESTION", + "fileLocations" : { + "inputFilePath" : "datasets/diagnoses-core", + "inputFileType" : "csv", + "outputURIReplacement" : ".*datasets,'/datasets'", + "separator" : "\\t" + } + } + } +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/flows/Labs.flow.json b/uml2es/examples/patient-hub/flows/Labs.flow.json new file mode 100755 index 0000000..933b874 --- /dev/null +++ b/uml2es/examples/patient-hub/flows/Labs.flow.json @@ -0,0 +1,42 @@ +{ + "name" : "Labs", + "description" : "", + "batchSize" : 200, + "threadCount" : 12, + "stopOnError" : false, + "options" : { }, + "version" : 0, + "steps" : { + "1" : { + "name" : "LabsCore", + "description" : "", + "options" : { + "additionalCollections" : [ ], + "headers" : { + "sources" : [ { + "name" : "Labs" + } ], + "createdOn" : "currentDateTime", + "createdBy" : "currentUser" + }, + "sourceQuery" : "cts.collectionQuery([])", + "collections" : [ "LabsCore" ], + "permissions" : "rest-reader,read,rest-writer,update", + "outputFormat" : "json", + "targetDatabase" : "xmi2es-examples-patient-hub-STAGING" + }, + "customHook" : { }, + "retryLimit" : 0, + "batchSize" : 0, + "threadCount" : 0, + "stepDefinitionName" : "default-ingestion", + "stepDefinitionType" : "INGESTION", + "fileLocations" : { + "inputFilePath" : "datasets/labs-core", + "inputFileType" : "csv", + "outputURIReplacement" : ".*datasets,'/datasets'", + "separator" : "\\t" + } + } + } +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/flows/Patients.flow.json b/uml2es/examples/patient-hub/flows/Patients.flow.json new file mode 100755 index 0000000..dc69049 --- /dev/null +++ b/uml2es/examples/patient-hub/flows/Patients.flow.json @@ -0,0 +1,62 @@ +{ + "name" : "Patients", + "description" : "A flow to build patient-based records", + "batchSize" : 50, + "threadCount" : 8, + "stopOnError" : false, + "options" : { }, + "version" : 0, + "steps" : { + "1" : { + "name" : "Patient-Core", + "description" : "", + "options" : { + "additionalCollections" : [ ], + "headers" : { + "sources" : [ { + "name" : "Patients" + } ], + "createdOn" : "currentDateTime", + "createdBy" : "currentUser" + }, + "sourceQuery" : "cts.collectionQuery([])", + "collections" : [ "Patient-Core" ], + "permissions" : "rest-reader,read,rest-writer,update", + "outputFormat" : "json", + "targetDatabase" : "xmi2es-examples-patient-hub-STAGING" + }, + "customHook" : { }, + "retryLimit" : 0, + "batchSize" : 0, + "threadCount" : 0, + "stepDefinitionName" : "default-ingestion", + "stepDefinitionType" : "INGESTION", + "fileLocations" : { + "inputFilePath" : "datasets/patients-core", + "inputFileType" : "csv", + "outputURIReplacement" : ".*datasets,'/datasets'", + "separator" : "\\t" + } + }, + "2" : { + "name" : "PopulateAdmissions", + "description" : "", + "options" : { + "additionalCollections" : [ "Patient" ], + "sourceQuery" : "cts.collectionQuery([\"Patient-Core\"])", + "targetEntity" : "", + "collections" : [ "PopulateAdmissions", "Patient" ], + "sourceDatabase" : "xmi2es-examples-patient-hub-STAGING", + "sourceCollection" : "Patient-Core", + "outputFormat" : "json", + "targetDatabase" : "xmi2es-examples-patient-hub-FINAL" + }, + "customHook" : null, + "retryLimit" : 0, + "batchSize" : 5, + "threadCount" : 5, + "stepDefinitionName" : "PopulateAdmissions", + "stepDefinitionType" : "CUSTOM" + } + } +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/gradle-local.properties b/uml2es/examples/patient-hub/gradle-local.properties new file mode 100644 index 0000000..849d0b6 --- /dev/null +++ b/uml2es/examples/patient-hub/gradle-local.properties @@ -0,0 +1,5 @@ +# Put your overrides from gradle.properties here +# Don't check this in to version control + +# mlUsername=admin +# mlPassword=admin diff --git a/uml2es/examples/patient-hub/gradle.properties b/uml2es/examples/patient-hub/gradle.properties new file mode 100644 index 0000000..631e567 --- /dev/null +++ b/uml2es/examples/patient-hub/gradle.properties @@ -0,0 +1,127 @@ +# These settings are used by the Data Hub Framework when +# communicating with MarkLogic. +# The values in this file are meant as project-wide settings. +# You can override these properties for a specific environment +# by creating a gradle-{environment}.properties file. +# For example, to create a properties file for your prod environment create a file +# named gradle-prod.properties. +# +# .... +mlDHFVersion=5.1.0 +mlHost=localhost + +# If you are working with a load balancer please specify it here +# mlIsHostLoadBalancer=false + +# Your MarkLogic Username and Password +mlUsername=admin +mlPassword=admin + +# If specified, the manage username/password combo is used with the ML Management REST API for managing application +# resources; this user must have the manage-admin and rest-admin roles. +# +# If these are not set, then mlUsername/mlPassword is used for managing application resources. +# mlManageUsername= +# mlManagePassword= +# +# To change the Manage Port +# mlManagePort=8002 +# +# To use SSL on the Manage appserver (port 8002 by default) +# mlManageScheme=https +# mlManageSimpleSsl=true +# +# If specified, mlSecurityUsername/mlSecurityPassword is used for talking to Security end points on port 8002; this +# user must have the "manage-admin" and "security" roles. +# +# mlSecurityUsername= +# mlSecurityPassword= +# +# To change the Admin Port +# mlAdminPort=8001 +# +# To use SSL on the Admin appserver (port 8001 by default) +# mlAdminScheme=https +# mlAdminSimpleSsl=true + + +# If specified, these values can override where the DHF thinks +# MarkLogic default ports are at. You would only use this if you +# have changed the ports on which MarkLogic listens +# +# mlAppServicesPort=8000 +# +# To use SSL on the AppServices appserver (port 8000 by default) +# mlAppServicesSimpleSsl=true + + +mlStagingAppserverName=xmi2es-examples-patient-hub-STAGING +mlStagingPort=24010 +mlStagingDbName=xmi2es-examples-patient-hub-STAGING +mlStagingForestsPerHost=3 +mlStagingAuth=digest +# To enable SSL for staging +# mlStagingSimpleSsl=true + +mlFinalAppserverName=xmi2es-examples-patient-hub-FINAL +mlFinalPort=24011 +mlFinalDbName=xmi2es-examples-patient-hub-FINAL +mlFinalForestsPerHost=3 +mlFinalAuth=digest +# To enable SSL for final +# mlFinalSimpleSsl=true + + +mlJobAppserverName=xmi2es-examples-patient-hub-JOBS +mlJobPort=24013 +mlJobDbName=xmi2es-examples-patient-hub-JOBS +mlJobForestsPerHost=4 +mlJobAuth=digest +# To enable SSL for jobs +# mlJobSimpleSsl=true + +mlModulesDbName=xmi2es-examples-patient-hub-MODULES +mlModulesForestsPerHost=1 + +mlStagingTriggersDbName=xmi2es-examples-patient-hub-staging-TRIGGERS +mlStagingTriggersForestsPerHost=1 + +mlStagingSchemasDbName=xmi2es-examples-patient-hub-staging-SCHEMAS +mlStagingSchemasForestsPerHost=1 + +mlFinalTriggersDbName=xmi2es-examples-patient-hub-final-TRIGGERS +mlFinalTriggersForestsPerHost=1 + +mlFinalSchemasDbName=xmi2es-examples-patient-hub-final-SCHEMAS +mlFinalSchemasForestsPerHost=1 + +# You can override this to specify an alternate folder for your +# custom forest info. Defaults to user-config/forests/ +# mlCustomForestPath=forests + +# The name of the Role to create for Hub Access +mlFlowOperatorRole=flow-operator-role +mlFlowOperatorUserName=flow-operator +# this password is autogenerated for you via the 'gradle hubInit' task +mlFlowOperatorPassword=2Z+~VE!PG>7N=KOmknr# + +# The name of the role to create for hub development +mlFlowDeveloperRole=flow-developer-role +mlFlowDeveloperUserName=flow-developer +mlFlowDeveloperPassword=Q.+EYa6rt|_*KKdM{A,~ + +# The name of the role to create for hub deployment +mlDataHubAdminRole=data-hub-admin-role + +# Deprecated property +# If you are working with a load balancer please indicate so using +# property "mlIsHostLoadBalancer" +# When "mlIsHostLoadBalancer" is set to "true", the value specified for "mlHost" will be used as the load balancer. +# You do not need to explicitly set the value of "mlLoadBalancerHosts" but if you do it must match the value of the property "mlHost" +# mlLoadBalancerHosts=your-load-balancer-hostname + +# Default module permissions which allow flow-operator-role to execute flows +mlModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,flow-developer-role,read,flow-developer-role,execute,flow-developer-role,insert,flow-operator-role,read,flow-operator-role,execute + +# If DHF is running in a provisioned environment please specify it here +# mlIsProvisionedEnvironment=false diff --git a/uml2es/examples/patient-hub/gradle/wrapper/gradle-wrapper.jar b/uml2es/examples/patient-hub/gradle/wrapper/gradle-wrapper.jar new file mode 100755 index 0000000..87b738c Binary files /dev/null and b/uml2es/examples/patient-hub/gradle/wrapper/gradle-wrapper.jar differ diff --git a/uml2es/examples/patient-hub/gradle/wrapper/gradle-wrapper.properties b/uml2es/examples/patient-hub/gradle/wrapper/gradle-wrapper.properties new file mode 100755 index 0000000..44e7c4d --- /dev/null +++ b/uml2es/examples/patient-hub/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/uml2es/examples/patient-hub/gradlew b/uml2es/examples/patient-hub/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/uml2es/examples/patient-hub/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/uml2es/examples/patient-hub/gradlew.bat b/uml2es/examples/patient-hub/gradlew.bat new file mode 100755 index 0000000..e95643d --- /dev/null +++ b/uml2es/examples/patient-hub/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/uml2es/examples/blockFactory/lib/log4j.properties b/uml2es/examples/patient-hub/lib/log4j.properties similarity index 100% rename from uml2es/examples/blockFactory/lib/log4j.properties rename to uml2es/examples/patient-hub/lib/log4j.properties diff --git a/uml2es/examples/patient-hub/src/main/entity-config/databases/final-database.json b/uml2es/examples/patient-hub/src/main/entity-config/databases/final-database.json new file mode 100644 index 0000000..76e1f5a --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/entity-config/databases/final-database.json @@ -0,0 +1,22 @@ +{ + "path-namespace" : [ { + "prefix" : "es", + "namespace-uri" : "http://marklogic.com/entity-services" + } ], + "range-element-index" : [ { + "collation" : "http://marklogic.com/collation/codepoint", + "invalid-values" : "reject", + "localname" : "AdmissionID", + "namespace-uri" : null, + "range-value-positions" : false, + "scalar-type" : "string" + }, { + "collation" : "http://marklogic.com/collation/codepoint", + "invalid-values" : "reject", + "localname" : "PatientID", + "namespace-uri" : null, + "range-value-positions" : false, + "scalar-type" : "string" + } ], + "database-name" : "%%mlFinalDbName%%" +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/src/main/entity-config/databases/staging-database.json b/uml2es/examples/patient-hub/src/main/entity-config/databases/staging-database.json new file mode 100644 index 0000000..582f0aa --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/entity-config/databases/staging-database.json @@ -0,0 +1,22 @@ +{ + "path-namespace" : [ { + "prefix" : "es", + "namespace-uri" : "http://marklogic.com/entity-services" + } ], + "range-element-index" : [ { + "collation" : "http://marklogic.com/collation/codepoint", + "invalid-values" : "reject", + "localname" : "AdmissionID", + "namespace-uri" : null, + "range-value-positions" : false, + "scalar-type" : "string" + }, { + "collation" : "http://marklogic.com/collation/codepoint", + "invalid-values" : "reject", + "localname" : "PatientID", + "namespace-uri" : null, + "range-value-positions" : false, + "scalar-type" : "string" + } ], + "database-name" : "%%mlStagingDbName%%" +} \ No newline at end of file diff --git a/uml2es/examples/patient-hub/src/main/entity-config/exp-final-entity-options.xml b/uml2es/examples/patient-hub/src/main/entity-config/exp-final-entity-options.xml new file mode 100644 index 0000000..a225fd5 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/entity-config/exp-final-entity-options.xml @@ -0,0 +1,92 @@ + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + limit=25 + frequency-order + descending + + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + + + + + + + + unfiltered + + + //*:instance/(Diagnoses|Admissions|Labs|Patients) + /*:envelope/*:headers + + + + true + + + \ No newline at end of file diff --git a/uml2es/examples/patient-hub/src/main/entity-config/exp-staging-entity-options.xml b/uml2es/examples/patient-hub/src/main/entity-config/exp-staging-entity-options.xml new file mode 100644 index 0000000..a225fd5 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/entity-config/exp-staging-entity-options.xml @@ -0,0 +1,92 @@ + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + limit=25 + frequency-order + descending + + + + + + limit=25 + frequency-order + descending + + + + + + + + + + + + + + + + + + unfiltered + + + //*:instance/(Diagnoses|Admissions|Labs|Patients) + /*:envelope/*:headers + + + + true + + + \ No newline at end of file diff --git a/uml2es/examples/patient-hub/src/main/entity-config/final-entity-options.xml b/uml2es/examples/patient-hub/src/main/entity-config/final-entity-options.xml new file mode 100644 index 0000000..a521f7b --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/entity-config/final-entity-options.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + limit=25 + + + + + + limit=25 + + + + + + + + + + + + + + + + + + unfiltered + + + //*:instance/(Diagnoses|Admissions|Labs|Patients) + + + + true + + + \ No newline at end of file diff --git a/uml2es/examples/patient-hub/src/main/entity-config/staging-entity-options.xml b/uml2es/examples/patient-hub/src/main/entity-config/staging-entity-options.xml new file mode 100644 index 0000000..a521f7b --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/entity-config/staging-entity-options.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + limit=25 + + + + + + limit=25 + + + + + + + + + + + + + + + + + + unfiltered + + + //*:instance/(Diagnoses|Admissions|Labs|Patients) + + + + true + + + \ No newline at end of file diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/databases/job-database.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/databases/job-database.json similarity index 82% rename from uml2es/examples/hrdm/src/main/hub-internal-config/databases/job-database.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/databases/job-database.json index fdf94a9..351b36b 100644 --- a/uml2es/examples/hrdm/src/main/hub-internal-config/databases/job-database.json +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/databases/job-database.json @@ -17,13 +17,21 @@ "range-value-positions": false, "invalid-values": "reject" }, + { + "scalar-type": "string", + "namespace-uri": "", + "localname": "flow", + "collation": "http://marklogic.com/collation/codepoint", + "range-value-positions": false, + "invalid-values": "ignore" + }, { "scalar-type": "dateTime", "namespace-uri": "", "localname": "startTime", "collation": "", "range-value-positions": false, - "invalid-values": "reject" + "invalid-values": "ignore" }, { "scalar-type": "dateTime", @@ -31,7 +39,23 @@ "localname": "endTime", "collation": "", "range-value-positions": false, - "invalid-values": "reject" + "invalid-values": "ignore" + }, + { + "scalar-type": "dateTime", + "namespace-uri": "", + "localname": "timeStarted", + "collation": "", + "range-value-positions": false, + "invalid-values": "ignore" + }, + { + "scalar-type": "dateTime", + "namespace-uri": "", + "localname": "timeEnded", + "collation": "", + "range-value-positions": false, + "invalid-values": "ignore" }, { "scalar-type": "string", diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/databases/staging-database.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/databases/staging-database.json similarity index 100% rename from uml2es/examples/hrdm/src/main/hub-internal-config/databases/staging-database.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/databases/staging-database.json diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/databases/staging-schemas-database.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/databases/staging-schemas-database.json similarity index 100% rename from uml2es/examples/hrdm/src/main/hub-internal-config/databases/staging-schemas-database.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/databases/staging-schemas-database.json diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/databases/staging-triggers-database.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/databases/staging-triggers-database.json similarity index 100% rename from uml2es/examples/hrdm/src/main/hub-internal-config/databases/staging-triggers-database.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/databases/staging-triggers-database.json diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-67.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-67.json new file mode 100644 index 0000000..094ad30 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-67.json @@ -0,0 +1,7 @@ +{ + "namespace" : "http://marklogic.com/smart-mastering/survivorship/merging", + "local-name" : "map-to-xml", + "document-uri" : "/com.marklogic.smart-mastering/survivorship/merging/base.xqy", + "modules-database" : "%%mlModulesDbName%%", + "role" : [ "search-internal" ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-68.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-68.json new file mode 100644 index 0000000..debb50d --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-68.json @@ -0,0 +1,7 @@ +{ + "namespace" : "http://marklogic.com/smart-mastering/survivorship/merging", + "local-name" : "construct-type", + "document-uri" : "/com.marklogic.smart-mastering/survivorship/merging/base.xqy", + "modules-database" : "%%mlModulesDbName%%", + "role" : [ "search-internal" ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-69.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-69.json new file mode 100644 index 0000000..2781c37 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-69.json @@ -0,0 +1,7 @@ +{ + "namespace" : "http://marklogic.com/smart-mastering/survivorship/merging", + "local-name" : "locked-uris", + "document-uri" : "/com.marklogic.smart-mastering/survivorship/merging/base.xqy", + "modules-database" : "%%mlModulesDbName%%", + "role" : [ "rest-reader-internal" ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-70.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-70.json new file mode 100644 index 0000000..e90c406 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-70.json @@ -0,0 +1,7 @@ +{ + "namespace" : "http://marklogic.com/rest-api/models/document-model-update-transform", + "local-name" : "post-bulk-documents", + "document-uri" : "/data-hub/5/rest-api/models/document-model-update-transform.xqy", + "modules-database" : "%%mlModulesDbName%%", + "role" : [ "rest-reader-internal" ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-71.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-71.json new file mode 100644 index 0000000..d70b1d8 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-71.json @@ -0,0 +1,7 @@ +{ + "namespace" : "http://marklogic.com/rest-api/lib/extensions-util", + "local-name" : "do-refresh-extension-metadata", + "document-uri" : "/data-hub/5/rest-api/lib/extensions-util.xqy", + "modules-database" : "%%mlModulesDbName%%", + "role" : [ "rest-reader-internal" ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-72.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-72.json new file mode 100644 index 0000000..bf15267 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-72.json @@ -0,0 +1,7 @@ +{ + "namespace" : "http://marklogic.com/rest-api/models/document-model-update-transform", + "local-name" : "xdmp-add-response-header", + "document-uri" : "/data-hub/5/rest-api/models/document-model-update-transform.xqy", + "modules-database" : "%%mlModulesDbName%%", + "role" : [ "rest-reader-internal" ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-73.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-73.json new file mode 100644 index 0000000..132fa33 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/amps/dhf-amp-73.json @@ -0,0 +1,7 @@ +{ + "namespace" : "http://www.w3.org/2005/xpath-functions", + "local-name" : "xdmp-add-response-header", + "document-uri" : "/data-hub/5/rest-api/endpoints/resource-service-query.xqy", + "modules-database" : "%%mlModulesDbName%%", + "role" : [ "rest-reader-internal" ] +} diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-data-hub.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-data-hub.json similarity index 100% rename from uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-data-hub.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-data-hub.json diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-entities.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-entities.json similarity index 100% rename from uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-entities.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-entities.json diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-mappings.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-mappings.json similarity index 100% rename from uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-mappings.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-mappings.json diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-trace-ui.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-trace-ui.json similarity index 100% rename from uml2es/examples/hrdm/src/main/hub-internal-config/security/privileges/dhf-internal-trace-ui.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/security/privileges/dhf-internal-trace-ui.json diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/roles/hub-admin-role.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/data-hub-admin-role.json similarity index 72% rename from uml2es/examples/hrdm/src/main/hub-internal-config/security/roles/hub-admin-role.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/data-hub-admin-role.json index b0ddb39..c991fec 100644 --- a/uml2es/examples/hrdm/src/main/hub-internal-config/security/roles/hub-admin-role.json +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/data-hub-admin-role.json @@ -1,5 +1,5 @@ { - "role-name": "%%mlHubAdminRole%%", + "role-name": "%%mlDataHubAdminRole%%", "description": "A role can deploy modules to a data hub instance.", "role": [ "rest-admin","manage-admin", "tde-admin" @@ -30,6 +30,16 @@ "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", "kind": "execute" }, + { + "privilege-name": "xdmp:xslt-eval", + "action": "http://marklogic.com/xdmp/privileges/xslt-eval", + "kind": "execute" + }, + { + "privilege-name": "xdmp:xslt-invoke", + "action": "http://marklogic.com/xdmp/privileges/xslt-invoke", + "kind": "execute" + }, { "privilege-name": "xdmp:invoke", "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", @@ -60,6 +70,16 @@ "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", "kind":"execute" }, + { + "privilege-name": "xdbc:insert", + "action": "http://marklogic.com/xdmp/privileges/xdbc-insert", + "kind": "execute" + }, + { + "privilege-name": "xdbc:insert-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-insert-in", + "kind": "execute" + }, { "privilege-name": "xdmp:document-load", "action": "http://marklogic.com/xdmp/privileges/xdmp-document-load", @@ -79,6 +99,16 @@ "privilege-name": "any-uri", "action": "http://marklogic.com/xdmp/privileges/any-uri", "kind": "execute" + }, + { + "privilege-name": "ps-user", + "action": "http://marklogic.com/xdmp/privileges/ps-user", + "kind": "execute" + }, + { + "privilege-name": "sem:sparql", + "action": "http://marklogic.com/xdmp/privileges/sem-sparql", + "kind": "execute" } ] } diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/flow-developer-role.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/flow-developer-role.json new file mode 100644 index 0000000..4387fb8 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/flow-developer-role.json @@ -0,0 +1,114 @@ +{ + "role-name": "%%mlFlowDeveloperRole%%", + "description": "A role can deploy modules to a data hub instance.", + "role": [ + "rest-admin","manage-admin","tde-admin" + ], + "privilege": [ + { + "privilege-name": "xdmp:set-server-field", + "action": "http://marklogic.com/xdmp/privileges/xdmp-set-server-field", + "kind": "execute" + }, + { + "privilege-name": "xdmp:get-server-field", + "action": "http://marklogic.com/xdmp/privileges/xdmp-get-server-field", + "kind":"execute" + }, + { + "privilege-name": "manage", + "action": "http://marklogic.com/xdmp/privileges/manage", + "kind": "execute" + }, + { + "privilege-name": "xdmp:eval", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval", + "kind": "execute" + }, + { + "privilege-name": "xdmp:eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", + "kind": "execute" + }, + { + "privilege-name": "xdmp:xslt-eval", + "action": "http://marklogic.com/xdmp/privileges/xslt-eval", + "kind": "execute" + }, + { + "privilege-name": "xdmp:xslt-invoke", + "action": "http://marklogic.com/xdmp/privileges/xslt-invoke", + "kind": "execute" + }, + { + "privilege-name": "xdmp:invoke", + "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", + "kind": "execute" + }, + { + "privilege-name": "xdmp:invoke-in", + "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke-in", + "kind": "execute" + }, + { + "privilege-name": "xdbc:invoke", + "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke", + "kind": "execute" + }, + { + "privilege-name": "xdbc:invoke-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-invoke-in", + "kind": "execute" + }, + { + "privilege-name": "xdbc:eval", + "action": "http://marklogic.com/xdmp/privileges/xdbc-eval", + "kind":"execute" + }, + { + "privilege-name": "xdbc:eval-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", + "kind":"execute" + }, + { + "privilege-name": "xdbc:insert", + "action": "http://marklogic.com/xdmp/privileges/xdbc-insert", + "kind": "execute" + }, + { + "privilege-name": "xdbc:insert-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-insert-in", + "kind": "execute" + }, + { + "privilege-name": "xdmp:document-load", + "action": "http://marklogic.com/xdmp/privileges/xdmp-document-load", + "kind": "execute" + }, + { + "privilege-name": "xdmp:get-server-field-names", + "action": "http://marklogic.com/xdmp/privileges/xdmp-get-server-field-names", + "kind": "execute" + }, + { + "privilege-name": "unprotected-collections", + "action": "http://marklogic.com/xdmp/privileges/unprotected-collections", + "kind": "execute" + }, + { + "privilege-name": "any-uri", + "action": "http://marklogic.com/xdmp/privileges/any-uri", + "kind": "execute" + }, + { + "privilege-name": "ps-user", + "action": "http://marklogic.com/xdmp/privileges/ps-user", + "kind": "execute" + }, + { + "privilege-name": "sem:sparql", + "action": "http://marklogic.com/xdmp/privileges/sem-sparql", + "kind": "execute" + } + ] +} diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/security/roles/data-hub-role.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/flow-operator-role.json similarity index 74% rename from uml2es/examples/hrdm/src/main/hub-internal-config/security/roles/data-hub-role.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/flow-operator-role.json index 0c52de4..23856b2 100644 --- a/uml2es/examples/hrdm/src/main/hub-internal-config/security/roles/data-hub-role.json +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/roles/flow-operator-role.json @@ -1,5 +1,5 @@ { - "role-name": "%%mlHubUserRole%%", + "role-name": "%%mlFlowOperatorRole%%", "description": "A role that allows the user to read and write from MarkLogic Data Hub databases", "role": [ "rest-reader", @@ -32,6 +32,16 @@ "action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in", "kind": "execute" }, + { + "privilege-name": "xdmp:xslt-eval", + "action": "http://marklogic.com/xdmp/privileges/xslt-eval", + "kind": "execute" + }, + { + "privilege-name": "xdmp:xslt-invoke", + "action": "http://marklogic.com/xdmp/privileges/xslt-invoke", + "kind": "execute" + }, { "privilege-name": "xdmp:invoke", "action": "http://marklogic.com/xdmp/privileges/xdmp-invoke", @@ -62,6 +72,16 @@ "action": "http://marklogic.com/xdmp/privileges/xdbc-eval-in", "kind":"execute" }, + { + "privilege-name": "xdbc:insert", + "action": "http://marklogic.com/xdmp/privileges/xdbc-insert", + "kind": "execute" + }, + { + "privilege-name": "xdbc:insert-in", + "action": "http://marklogic.com/xdmp/privileges/xdbc-insert-in", + "kind": "execute" + }, { "privilege-name": "xdmp:document-load", "action": "http://marklogic.com/xdmp/privileges/xdmp-document-load", @@ -86,6 +106,16 @@ "privilege-name": "unprotected-uri", "action": "http://marklogic.com/xdmp/privileges/unprotected-uri", "kind": "execute" + }, + { + "privilege-name": "ps-user", + "action": "http://marklogic.com/xdmp/privileges/ps-user", + "kind": "execute" + }, + { + "privilege-name": "sem:sparql", + "action": "http://marklogic.com/xdmp/privileges/sem-sparql", + "kind": "execute" } ] } diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/users/flow-developer-user.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/users/flow-developer-user.json new file mode 100644 index 0000000..677c9cb --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/users/flow-developer-user.json @@ -0,0 +1,6 @@ +{ + "user-name": "%%mlFlowDeveloperUserName%%", + "description": "A user that is used for reading and writing from MarkLogic Data Hub databases and for maintaining DHF modules", + "password": "%%mlFlowDeveloperPassword%%", + "role": ["%%mlFlowDeveloperRole%%","%%mlFlowOperatorRole%%"] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/security/users/flow-operator-user.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/users/flow-operator-user.json new file mode 100644 index 0000000..2f84399 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/security/users/flow-operator-user.json @@ -0,0 +1,6 @@ +{ + "user-name": "%%mlFlowOperatorUserName%%", + "description": "A user that is used for reading and writing from MarkLogic Data Hub databases", + "password": "%%mlFlowOperatorPassword%%", + "role": ["%%mlFlowOperatorRole%%"] +} diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/servers/job-server.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/servers/job-server.json similarity index 82% rename from uml2es/examples/hrdm/src/main/hub-internal-config/servers/job-server.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/servers/job-server.json index 7d6c8fd..b976718 100644 --- a/uml2es/examples/hrdm/src/main/hub-internal-config/servers/job-server.json +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/servers/job-server.json @@ -9,6 +9,6 @@ "authentication": "%%mlJobAuth%%", "default-error-format": "json", "error-handler": "/MarkLogic/rest-api/error-handler.xqy", - "url-rewriter": "/data-hub/4/tracing/tracing-rewriter.xml", + "url-rewriter": "/data-hub/5/tracing/%%mlServerVersion%%-tracing-rewriter.xml", "rewrite-resolves-globally": true } diff --git a/uml2es/examples/hrdm/src/main/hub-internal-config/servers/staging-server.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/servers/staging-server.json similarity index 70% rename from uml2es/examples/hrdm/src/main/hub-internal-config/servers/staging-server.json rename to uml2es/examples/patient-hub/src/main/hub-internal-config/servers/staging-server.json index aecf219..e6858cc 100644 --- a/uml2es/examples/hrdm/src/main/hub-internal-config/servers/staging-server.json +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/servers/staging-server.json @@ -8,7 +8,7 @@ "content-database": "%%mlStagingDbName%%", "authentication": "%%mlStagingAuth%%", "default-error-format": "json", - "error-handler": "/data-hub/4/rest-api/error-handler.xqy", - "url-rewriter": "/data-hub/4/rest-api/rewriter.xml", + "error-handler": "/MarkLogic/rest-api/error-handler.xqy", + "url-rewriter": "/data-hub/5/rest-api/rewriter/%%mlServerVersion%%-rewriter.xml", "rewrite-resolves-globally": true } diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-create.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-create.json new file mode 100644 index 0000000..fc4fe41 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-create.json @@ -0,0 +1,35 @@ +{ + "name": "ml-dh-entity-create", + "description": "MarkLogic Data Hub entity model creation trigger", + "event": { + "data-event": { + "collection-scope": { + "uri": "http://marklogic.com/entity-services/models" + }, + "document-content": { + "update-kind": "create" + }, + "when": "post-commit" + } + }, + "module": "data-hub/4/triggers/entity-model-trigger.xqy", + "module-db": "%%mlModulesDbName%%", + "module-root": "/", + "enabled": true, + "recursive": true, + "task-priority": "normal", + "permission": [ + { + "role-name": "%%mlDataHubAdminRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowDeveloperRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowOperatorRole%%", + "capability": "read" + } + ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-delete.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-delete.json new file mode 100644 index 0000000..c4b4047 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-delete.json @@ -0,0 +1,35 @@ +{ + "name": "ml-dh-entity-delete", + "description": "MarkLogic Data Hub entity model delete trigger", + "event": { + "data-event": { + "collection-scope": { + "uri": "http://marklogic.com/entity-services/models" + }, + "document-content": { + "update-kind": "delete" + }, + "when": "post-commit" + } + }, + "module": "data-hub/4/triggers/entity-model-delete-trigger.xqy", + "module-db": "%%mlModulesDbName%%", + "module-root": "/", + "enabled": true, + "recursive": true, + "task-priority": "normal", + "permission": [ + { + "role-name": "%%mlDataHubAdminRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowDeveloperRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowOperatorRole%%", + "capability": "read" + } + ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-modify.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-modify.json new file mode 100644 index 0000000..6501ca2 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-modify.json @@ -0,0 +1,35 @@ +{ + "name": "ml-dh-entity-modify", + "description": "MarkLogic Data Hub entity model update trigger", + "event": { + "data-event": { + "collection-scope": { + "uri": "http://marklogic.com/entity-services/models" + }, + "document-content": { + "update-kind": "modify" + }, + "when": "post-commit" + } + }, + "module": "data-hub/4/triggers/entity-model-trigger.xqy", + "module-db": "%%mlModulesDbName%%", + "module-root": "/", + "enabled": true, + "recursive": true, + "task-priority": "normal", + "permission": [ + { + "role-name": "%%mlDataHubAdminRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowDeveloperRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowOperatorRole%%", + "capability": "read" + } + ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-validate-create.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-validate-create.json new file mode 100644 index 0000000..ee3a69a --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-validate-create.json @@ -0,0 +1,35 @@ +{ + "name": "ml-dh-entity-validate-create", + "description": "MarkLogic Data Hub entity model creation validation pre-commit trigger", + "event": { + "data-event": { + "collection-scope": { + "uri": "http://marklogic.com/entity-services/models" + }, + "document-content": { + "update-kind": "create" + }, + "when": "pre-commit" + } + }, + "module": "data-hub/4/triggers/entity-model-validate-trigger.xqy", + "module-db": "%%mlModulesDbName%%", + "module-root": "/", + "enabled": true, + "recursive": true, + "task-priority": "normal", + "permission": [ + { + "role-name": "%%mlDataHubAdminRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowDeveloperRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowOperatorRole%%", + "capability": "read" + } + ] +} diff --git a/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-validate-modify.json b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-validate-modify.json new file mode 100644 index 0000000..26d12e1 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/hub-internal-config/triggers/ml-dh-entity-validate-modify.json @@ -0,0 +1,35 @@ +{ + "name": "ml-dh-entity-validate-modify", + "description": "MarkLogic Data Hub entity model update validation pre-commit trigger", + "event": { + "data-event": { + "collection-scope": { + "uri": "http://marklogic.com/entity-services/models" + }, + "document-content": { + "update-kind": "modify" + }, + "when": "pre-commit" + } + }, + "module": "data-hub/4/triggers/entity-model-validate-trigger.xqy", + "module-db": "%%mlModulesDbName%%", + "module-root": "/", + "enabled": true, + "recursive": true, + "task-priority": "normal", + "permission": [ + { + "role-name": "%%mlDataHubAdminRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowDeveloperRole%%", + "capability": "update" + }, + { + "role-name": "%%mlFlowOperatorRole%%", + "capability": "read" + } + ] +} diff --git a/uml2es/examples/hrdm/src/main/ml-config/databases/final-database.json b/uml2es/examples/patient-hub/src/main/ml-config/databases/final-database.json similarity index 88% rename from uml2es/examples/hrdm/src/main/ml-config/databases/final-database.json rename to uml2es/examples/patient-hub/src/main/ml-config/databases/final-database.json index ea41677..44f8e71 100644 --- a/uml2es/examples/hrdm/src/main/ml-config/databases/final-database.json +++ b/uml2es/examples/patient-hub/src/main/ml-config/databases/final-database.json @@ -1,6 +1,5 @@ { "database-name": "%%mlFinalDbName%%", - "range-element-index": [], "schema-database": "%%mlFinalSchemasDbName%%", "triggers-database": "%%mlFinalTriggersDbName%%", "triple-index": true, diff --git a/uml2es/examples/hrdm/src/main/ml-config/databases/final-schemas-database.json b/uml2es/examples/patient-hub/src/main/ml-config/databases/final-schemas-database.json similarity index 100% rename from uml2es/examples/hrdm/src/main/ml-config/databases/final-schemas-database.json rename to uml2es/examples/patient-hub/src/main/ml-config/databases/final-schemas-database.json diff --git a/uml2es/examples/hrdm/src/main/ml-config/databases/final-triggers-database.json b/uml2es/examples/patient-hub/src/main/ml-config/databases/final-triggers-database.json similarity index 100% rename from uml2es/examples/hrdm/src/main/ml-config/databases/final-triggers-database.json rename to uml2es/examples/patient-hub/src/main/ml-config/databases/final-triggers-database.json diff --git a/uml2es/examples/hrdm/src/main/ml-config/databases/modules-database.json b/uml2es/examples/patient-hub/src/main/ml-config/databases/modules-database.json similarity index 100% rename from uml2es/examples/hrdm/src/main/ml-config/databases/modules-database.json rename to uml2es/examples/patient-hub/src/main/ml-config/databases/modules-database.json diff --git a/uml2es/examples/hrdm/src/main/ml-config/servers/final-server.json b/uml2es/examples/patient-hub/src/main/ml-config/servers/final-server.json similarity index 100% rename from uml2es/examples/hrdm/src/main/ml-config/servers/final-server.json rename to uml2es/examples/patient-hub/src/main/ml-config/servers/final-server.json diff --git a/uml2es/examples/patient-hub/src/main/ml-modules/root/custom-modules/custom/BuildAdmissions/main.sjs b/uml2es/examples/patient-hub/src/main/ml-modules/root/custom-modules/custom/BuildAdmissions/main.sjs new file mode 100755 index 0000000..95d43b2 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/ml-modules/root/custom-modules/custom/BuildAdmissions/main.sjs @@ -0,0 +1,97 @@ +/* + Copyright 2012-2019 MarkLogic Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +const DataHub = require("/data-hub/5/datahub.sjs"); +const datahub = new DataHub(); + +function main(content, options) { + + let outputFormat = options.outputFormat ? options.outputFormat.toLowerCase() : datahub.flow.consts.DEFAULT_FORMAT; + + let doc = content.value; + if (doc && (doc instanceof Document || doc instanceof XMLDocument)) { + doc = fn.head(doc.root); + } + + let instance = {"Admission" : datahub.flow.flowUtils.getInstance(doc).toObject() } || {}; + let triples = datahub.flow.flowUtils.getTriples(doc) || []; + let headers = datahub.flow.flowUtils.getHeaders(doc) || {}; + + instance['$attachments'] = doc.envelope.instance; + + + //let's assemble our admissions here, first we grab the patient and admission ID + let patientID = instance.Admission.PatientID; + let admissionID = instance.Admission.AdmissionID; + + //now, we search for the labs that match this patient ID and admission ID, then add those + let diagnosesDocs = cts.search(cts.andQuery([cts.jsonPropertyRangeQuery('PatientID', '=', patientID), cts.jsonPropertyRangeQuery('AdmissionID', '=',admissionID),cts.collectionQuery(['DiagnosesCore'])])) + +xdmp.log("BuildAdmissions: PATIENTID=" + patientID + "*, #diag=" + fn.count(diagnosesDocs) + " in " + xdmp.databaseName(xdmp.database())); + + const Diagnoses = []; + for (const diagnosisDoc of diagnosesDocs) { + let diagnosis = {}; + diagnosis.PrimaryDiagnosisCode = diagnosisDoc.xpath('//PrimaryDiagnosisCode'); + diagnosis.PrimaryDiagnosisDescription = diagnosisDoc.xpath('//PrimaryDiagnosisDescription'); + Diagnoses.push({'Diagnosis' : diagnosis}); + }; + + instance.Admission.Diagnoses = Diagnoses; + + //time to grab the labs and do the same thing + let labsDocs = cts.search( + cts.andQuery([ + cts.jsonPropertyRangeQuery('PatientID', '=', patientID), + cts.jsonPropertyRangeQuery('AdmissionID', '=',admissionID), + cts.collectionQuery(['LabsCore']) + ]) + ) + + const Labs = []; + for (const labDoc of labsDocs) { + let lab = {}; + lab.Name = labDoc.xpath('//LabName'); + lab.Value = labDoc.xpath('//LabValue'); + lab.Units = labDoc.xpath('//LabUnits'); + lab.Datetime = labDoc.xpath('//LabDateTime') + Labs.push({'Lab' : lab }); + }; + + instance.Admission.Labs = Labs; + + //delete PatientID, since we only want AdmissionID, startdate and enddate from Admissions entity + delete instance.Admission.PatientID; + instance.info = { + "title": "Admission", + "version": "0.0.1" + }; + + //form our envelope here now, specifying our output format + let envelope = datahub.flow.flowUtils.makeEnvelope(instance, headers, triples, outputFormat); + + //assign our envelope value + content.value = envelope; + + //assign the uri we want + content.uri = '/admissionComplete' + content.uri; + + return content; +} + +module.exports = { + main: main +}; diff --git a/uml2es/examples/patient-hub/src/main/ml-modules/root/custom-modules/custom/PopulateAdmissions/main.sjs b/uml2es/examples/patient-hub/src/main/ml-modules/root/custom-modules/custom/PopulateAdmissions/main.sjs new file mode 100755 index 0000000..59387e7 --- /dev/null +++ b/uml2es/examples/patient-hub/src/main/ml-modules/root/custom-modules/custom/PopulateAdmissions/main.sjs @@ -0,0 +1,82 @@ +/* + Copyright 2012-2019 MarkLogic Corporation + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +const DataHub = require("/data-hub/5/datahub.sjs"); +const datahub = new DataHub(); + +function main(content, options) { + + let outputFormat = options.outputFormat ? options.outputFormat.toLowerCase() : datahub.flow.consts.DEFAULT_FORMAT; + + let doc = content.value; + if (doc && (doc instanceof Document || doc instanceof XMLDocument)) { + doc = fn.head(doc.root); + } + + let instance = {'Patient':{}}; + let triples = datahub.flow.flowUtils.getTriples(doc) || []; + let headers = datahub.flow.flowUtils.getHeaders(doc) || {}; + + instance['$attachments'] = doc.envelope.instance.toObject(); + + //let's assemble our patients here, first we grab the patient ID + let patientID = doc.envelope.instance.PatientID; + + //now, we search for the admissions docs that match this patient ID and harmonize + let admissionsDocs = cts.search( + cts.andQuery([ + cts.jsonPropertyRangeQuery('PatientID', '=', patientID), + cts.collectionQuery(['CompletedAdmissions']) + ]) + ); + +xdmp.log("PopulateAdmissions PATIENTID=" + patientID + "*, #adm=" + fn.count(admissionsDocs) + " in " + xdmp.databaseName(xdmp.database())); + const Admissions = []; + for (const admissionDoc of admissionsDocs) { + let admission = admissionDoc.xpath('/envelope/instance').toObject()[0]; + Admissions.push(admission); + }; + + instance.Patient.Admissions = Admissions; + + instance.Patient.PatientID = doc.envelope.instance.PatientID; + instance.Patient.Gender = doc.envelope.instance.PatientGender; + instance.Patient.DoB = doc.envelope.instance.PatientDateOfBirth; + instance.Patient.Race = doc.envelope.instance.PatientRace; + instance.Patient['Marital-status'] = doc.envelope.instance.PatientMaritalStatus; + instance.Patient.Language = doc.envelope.instance.PatientLanguage; + instance.Patient.PercentageBelowPoverty = xs.decimal(doc.envelope.instance.PatientPopulationPercentageBelowPoverty); + + instance.info = { + "title": "Patient", + "version": "0.0.1" + }; + + //form our envelope here now, specifying our output format + let envelope = datahub.flow.flowUtils.makeEnvelope(instance, headers, triples, outputFormat); + + //assign our envelope value + content.value = envelope; + + //assign the uri we want, in this case the same + content.uri = '/patients/admissions'+content.uri; + + return content; +} + +module.exports = { + main: main +}; diff --git a/uml2es/examples/patient-hub/step-definitions/custom/BuildAdmissions/BuildAdmissions.step.json b/uml2es/examples/patient-hub/step-definitions/custom/BuildAdmissions/BuildAdmissions.step.json new file mode 100755 index 0000000..f0cb135 --- /dev/null +++ b/uml2es/examples/patient-hub/step-definitions/custom/BuildAdmissions/BuildAdmissions.step.json @@ -0,0 +1,8 @@ +{ + "lang" : "zxx", + "name" : "BuildAdmissions", + "description" : "", + "type" : "CUSTOM", + "version" : 1, + "modulePath" : "/custom-modules/custom/BuildAdmissions/main.sjs" +} diff --git a/uml2es/examples/patient-hub/step-definitions/custom/PopulateAdmissions/PopulateAdmissions.step.json b/uml2es/examples/patient-hub/step-definitions/custom/PopulateAdmissions/PopulateAdmissions.step.json new file mode 100755 index 0000000..c14872c --- /dev/null +++ b/uml2es/examples/patient-hub/step-definitions/custom/PopulateAdmissions/PopulateAdmissions.step.json @@ -0,0 +1,8 @@ +{ + "lang" : "zxx", + "name" : "PopulateAdmissions", + "description" : "", + "type" : "CUSTOM", + "version" : 1, + "modulePath" : "/custom-modules/custom/PopulateAdmissions/main.sjs" +} diff --git a/uml2es/examples/runningRace/README.md b/uml2es/examples/runningRace/README.md index 9b20e45..ceec1e3 100644 --- a/uml2es/examples/runningRace/README.md +++ b/uml2es/examples/runningRace/README.md @@ -31,7 +31,7 @@ Setup new DB. Will use basic DB config with no indexes. Will bring in XMI2ES tra Run the following: -gradle -PenvironmentName=local -i setup mlDeploy +./gradlew -i setup mlDeploy Confirm: - New DB and app server created with name xmi2es-examples-runningRace. @@ -42,13 +42,13 @@ Now we deploy our three running race UML models. They end up as Entity Services First, the MagicDraw model: -gradle -i -b uml2es.gradle -PmodelName=RunningRace uDeployModel +./gradlew -i -b uml2es.gradle -PmodelFile=../umlModels/RunningRace.xml uDeployModel Next the EMF and Papyrus models: -gradle -i -b uml2es.gradle -PmodelName=RunningRaceEMF uDeployModel +./gradlew -i -b uml2es.gradle -PmodelFile=data/RunningRaceEMF/model/RunningRaceEMF.uml uDeployModel -gradle -i -b uml2es.gradle -PmodelName=RunningRacePapyrus uDeployModel +./gradlew -i -b uml2es.gradle -PmodelFile=data/RunningRacePapyrus/RunningRacePapyrus.uml uDeployModel Confirm: - Content DB includes several documents created when loading the XMI files, including: diff --git a/uml2es/examples/runningRace/build.gradle b/uml2es/examples/runningRace/build.gradle index 97c196a..4863934 100644 --- a/uml2es/examples/runningRace/build.gradle +++ b/uml2es/examples/runningRace/build.gradle @@ -1,12 +1,13 @@ + buildscript { repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} mavenLocal() - maven { url "http://plugins.gradle.org/m2" } + maven { url "https://plugins.gradle.org/m2" } } dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" + classpath "com.marklogic:ml-gradle:4.0.1" classpath "net.saliman:gradle-properties-plugin:1.4.6" } } @@ -15,14 +16,14 @@ apply plugin: "net.saliman.properties" apply plugin: "com.marklogic.ml-gradle" repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } + maven { url "https://plugins.gradle.org/m2" } + maven { url "https://developer.marklogic.com/maven2/" } // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } + maven { url "https://repository.cloudera.com/artifactory/cloudera-repos/" } } configurations { @@ -37,24 +38,17 @@ configurations { } dependencies { - mlcp "com.marklogic:mlcp:9.0.6" + mlcp "com.marklogic:mlcp:9.0.10" mlcp "org.apache.commons:commons-csv:1.2" mlcp files("lib") } + task includeXMI2ESTransform(type: Copy) { from "../../uml2esTransform/src/main/ml-modules/root/xmi2es" into "src/main/ml-modules/root/xmi2es" } -task includeModel(type: Copy) { - def xmiDir = new File("${projectDir}").getParentFile().getAbsolutePath() + "/umlModels" - from xmiDir + "/RunningRace.xml" - from xmiDir + "/RunningRaceEMF.xml" - from xmiDir + "/RunningRacePapyrus.xml" - into "data/model" -} - task includeUGradle() { // Don't use Copy task bcuz file locking into gradle project dir on Windows doLast { @@ -67,7 +61,6 @@ task includeUGradle() { task setup() { dependsOn('includeXMI2ESTransform') - dependsOn('includeModel') dependsOn('includeUGradle') } diff --git a/uml2es/examples/runningRace/gradle/wrapper/gradle-wrapper.jar b/uml2es/examples/runningRace/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c Binary files /dev/null and b/uml2es/examples/runningRace/gradle/wrapper/gradle-wrapper.jar differ diff --git a/uml2es/examples/runningRace/gradle/wrapper/gradle-wrapper.properties b/uml2es/examples/runningRace/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..44e7c4d --- /dev/null +++ b/uml2es/examples/runningRace/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/uml2es/examples/runningRace/gradlew b/uml2es/examples/runningRace/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/uml2es/examples/runningRace/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/uml2es/examples/umlModels/D5_ContactObjects_MD.png b/uml2es/examples/umlModels/D5_ContactObjects_MD.png new file mode 100644 index 0000000..8f2e672 Binary files /dev/null and b/uml2es/examples/umlModels/D5_ContactObjects_MD.png differ diff --git a/uml2es/examples/umlModels/D5_ContactObjects_MD.xml b/uml2es/examples/umlModels/D5_ContactObjects_MD.xml new file mode 100644 index 0000000..916c675 --- /dev/null +++ b/uml2es/examples/umlModels/D5_ContactObjects_MD.xml @@ -0,0 +1,931 @@ + + + + + + + + MagicDraw UML + 18.5 + + + MagicDraw UML + 18.5 + + + + + + + + + + + + + + + + + + _18_5_2_8c5028b_1515334127154_25297_4924 + _18_5_2_8c5028b_1515249307192_458965_4794 + _18_5_2_8c5028b_1515334062191_371511_4889 + _18_5_2_8c5028b_1515333870182_154454_4844 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_18_5_2_8c5028b_1506531077285_665817_5189"/> + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_18_5_2_8c5028b_1541008090722_724767_5273"/> + + + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _18_5_2_8c5028b_1506531000136_647190_5168 + _18_5_2_8c5028b_1506531020694_739193_5173 + _18_5_2_8c5028b_1541008064756_656631_5244 + _18_5_2_8c5028b_1506530971176_692582_5131 + + + _9_0_be00301_1108044380615_150487_0 + _16_8beta_8ca0285_1257244649124_794756_344 + magicdraw_uml_standard_profile_v_0001 + _be00301_1073306188629_537791_2 + _be00301_1077726770128_871366_1 + _be00301_1073394345322_922552_1 + + + eee_1045467100313_135436_1 + + + _18_5_2_8c5028b_1515334127154_25297_4924 + _18_5_2_8c5028b_1515333870182_154454_4844 + _18_5_2_8c5028b_1515249307192_458965_4794 + _18_5_2_8c5028b_1515334062191_371511_4889 + + + + + + + + + + + + + + + + + + + + + magicdraw_uml_standard_profile_v_0001 + + + _18_5_2_8c5028b_1518721387851_92319_5302 + + local:/PROJECT-d4965b8a-e2ad-4a99-8d74-fd88537cc249?resource=com.nomagic.magicdraw.uml_umodel.shared_umodel#_18_5_3_8c5028b_1586453288059_651876_5360 + + + + _18_5_2_8c5028b_1506442711620_81982_4814 + + + _18_5_3_8c5028b_1586453288059_651876_5360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + H4sIAAAAAAAAAFPmUg7JKFVwLChSMLBUMDSxMjSyMjZQcHUJUTAyMDLgSs7P1cvLz01Mz0zWA5MpRYnleqW5OfG5+SmpOXpg0tbJ088xKFI3JdXA3Mg8NUnX2MzYWNckLdVY18I4NUU30TTNMjkxJdU0KTGRCwDgWnIIcgAAAA== + + + H4sIAAAAAAAAAFPmUg7JKFVwLChSMLBUMDSxMjSyMjZQcHUJUTAyMDLgAgBVtzs5IAAAAA== + + + + + + + + 5, 5, 1161, 865 + + + + + + + + FILL_COLOR + FILL_COLOR_DESCRIPTION + + + + 35, 49, 204, 131 + + + + + + + + FILL_COLOR + FILL_COLOR_DESCRIPTION + + + + 35, 196, 102, 79 + + + + + + + + FILL_COLOR + FILL_COLOR_DESCRIPTION + + + + 154, 196, 132, 66 + + + + + + + + FILL_COLOR + FILL_COLOR_DESCRIPTION + + + + 70, 287, 129, 66 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> + + + + + + + + + + + + + + + H4sIAAAAAAAAAMVWy46bMBTd8xVIw9YI82YkFvNatIu2GmXTFTL2JXgENjJO2/x9nYTMIxOSYZqkbDD2vT73HM41XN3JtiOal7zhemmD0GppXc3qhX3TKdvLbBxeY/868OyH+5nte75n3XJBFIfe7ZTsQGkzzPfMWWb4Z+k2kpKmKH48fv/6cDdzahZmcVSmxKnBJ8ypQ5JlTp2yJHTqiqVpFCSU+mFWKOjlQlEoqGwdJmRL5pw6bH1jivx22KJtikUrGTRmenPrBen6Wur8f4KPMPc8DzOCDWySMt+AZxg7dVmy2Kkz4lcpjoPEK+OJ4H1NFLCXx8MKXLaIMylBuSkENBnQDMgTUH127sdgLeP8XgrSIJPnDmnus2IulQrcIcuVneZSmIYZcob5YTo/3VbWhB1MaCvFTin/mD+GD0M0NWqCmHMBoLiYj8GNhI/svvLm+jW5gzPXDyN77w++7Pk1rYsvW8QbjSl3NzVtV10GPVW801K9Gr61zUeTrIEh2hJEK35oRQ+t2KHX5PIpwbscnvt46+Hdet8FHHXaxyy28dauOKZzea9BGJuv3/UgV6f4L6KBQQeCmdVlY6LeKTsl+RiLwlxrG3SSC91Pap9DuSPdlCZJFKWQ+X5YYRyyyGNAcBVkBFOMR/37yQ/AmdCs2y/fbh5/IgZe4idQoiAOAhRWEKA0AIZIVGWUMIhKQvIJsafV7CQHz0WwX76j+341Dy1afwHXt1rAzwoAAA== + + \ No newline at end of file diff --git a/uml2es/examples/umlModels/D5_ContactObjects_Pap.png b/uml2es/examples/umlModels/D5_ContactObjects_Pap.png new file mode 100644 index 0000000..c1d4cc3 Binary files /dev/null and b/uml2es/examples/umlModels/D5_ContactObjects_Pap.png differ diff --git a/uml2es/examples/umlModels/D5_H5_Pap.png b/uml2es/examples/umlModels/D5_H5_Pap.png new file mode 100644 index 0000000..5175ef7 Binary files /dev/null and b/uml2es/examples/umlModels/D5_H5_Pap.png differ diff --git a/uml2es/examples/umlModels/D5_HR_MD.png b/uml2es/examples/umlModels/D5_HR_MD.png new file mode 100644 index 0000000..ff91767 Binary files /dev/null and b/uml2es/examples/umlModels/D5_HR_MD.png differ diff --git a/uml2es/examples/umlModels/D5_HR_MD.xml b/uml2es/examples/umlModels/D5_HR_MD.xml new file mode 100644 index 0000000..d72f002 --- /dev/null +++ b/uml2es/examples/umlModels/D5_HR_MD.xml @@ -0,0 +1,1369 @@ + + + + + + + + MagicDraw UML + 18.5 + + + + + + + + + MagicDraw UML + 18.5 + + + + + + + + + + + + + + + + + + + + + + + + + + _18_5_2_8c5028b_1515334127154_25297_4924 + _18_5_3_8c5028b_1586453728079_388243_5396 + _18_5_3_8c5028b_1586453728124_590679_5546 + _18_5_3_8c5028b_1586453728093_153430_5447 + _18_5_2_8c5028b_1515249307192_458965_4794 + _18_5_3_8c5028b_1586453728134_165738_5607 + _18_5_3_8c5028b_1586453728127_760822_5564 + _18_5_2_8c5028b_1515334062191_371511_4889 + _18_5_3_8c5028b_1586453728131_30187_5578 + _18_5_3_8c5028b_1586453728096_77095_5476 + _18_5_2_8c5028b_1515333870182_154454_4844 + _18_5_3_8c5028b_1586453728090_488500_5425 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org:OrganizationalUnit + + + + + + + + + + + + + + foaf:Agent + + + + org,http://www.w3.org/ns/org# + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _18_5_2_8c5028b_1520185415749_537350_5187 + _18_5_2_8c5028b_1506442601753_594892_4700 + _18_5_2_8c5028b_1506531020694_739193_5173 + _18_5_2_8c5028b_1506468701332_804406_4917 + _18_5_2_8c5028b_1518533879331_259602_5090 + _18_5_2_8c5028b_1518562691679_246633_5247 + _18_5_2_8c5028b_1506442679182_592561_4784 + _18_5_2_8c5028b_1520185359822_325005_5132 + _18_5_2_8c5028b_1506531000136_647190_5168 + _18_5_2_8c5028b_1520185379843_965008_5160 + _18_5_2_8c5028b_1541008580186_999238_5280 + _18_5_2_8c5028b_1541008064756_656631_5244 + _18_5_2_8c5028b_1518562583960_84992_5215 + _18_5_2_8c5028b_1520331958226_797849_5177 + _18_5_2_8c5028b_1520331991781_589912_5204 + _18_5_2_8c5028b_1506530971176_692582_5131 + _18_5_2_8c5028b_1520084972378_328811_5248 + + + _9_0_2_91a0295_1110274713995_297054_0 + _be00301_1073305590699_364818_1 + magicdraw_uml_standard_profile_v_0001 + _be00301_1073394345322_922552_1 + _16_8beta_8ca0285_1257244649124_794756_344 + _be00301_1073306188629_537791_2 + _be00301_1077726770128_871366_1 + _9_0_be00301_1108044380615_150487_0 + donce_1051693917650_319078_0 + _17_0beta_f720368_1291217394082_340077_1886 + + + _18_5_2_8c5028b_1515249307192_458965_4794 + _18_5_2_8c5028b_1515334127154_25297_4924 + _18_5_2_8c5028b_1515334062191_371511_4889 + _18_5_2_8c5028b_1515333870182_154454_4844 + + + _18_5_3_8c5028b_1586453728099_3558_5487 + + + + + + + + + + + + + + + + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + + + + + + + magicdraw_uml_standard_profile_v_0001 + + + _18_5_3_8c5028b_1586453728133_280404_5586 + + + _18_5_2_8c5028b_1506442711620_81982_4814 + + + _18_5_3_8c5028b_1586453728133_280404_5586 + + + _18_5_3_8c5028b_1586453288059_651876_5360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + H4sIAAAAAAAAAFPmUg7JKFVwLChSMLBUMDS1AiIjQwVXlxAFIwMjA67k/Fy9vPzcxPTMZD0wmVKUWK5XmpsTn5ufkpqjByZtnTz9HIMidc3MDJIMDS1MdA3NzBJ1TSxTzXQtLZPMdM2MTVOMk5OSTMxNjLkAKrXvxHIAAAA= + + + + + + + + 5, 5, 1161, 865 + + + + + + 189, 7, 575, 150 + + + + + + 28, 231, 777, 332 + + + + + + + + 438, 157; 438, 231; + + + + + + + + 433, 157, 10, 10 + + + + + 378, 160, 57, 13 + + -memberOf + + + 441, 160, 24, 13 + + 0..1 + + + 359, 176, 76, 26 + + «semProperty» +«exclude» + + + 441, 176, 136, 13 + + <html><body> +<p>{predicate&nbsp;=&nbsp;"org:memberOf"}</p> +</body></html> + + + + + + + + + + 433, 221, 10, 10 + + + + + + + + + + + + 623, 563; 623, 584; 742, 584; 742, 563; + + + + + + + + 618, 563, 10, 10 + + + + + 567, 566, 53, 13 + + -reportsTo + + + 626, 566, 24, 13 + + 0..1 + + + 544, 582, 76, 26 + + «semProperty» +«exclude» + + + 626, 582, 132, 13 + + <html><body> +<p>{predicate&nbsp;=&nbsp;"org:reportsTo"}</p> +</body></html> + + + + + + + + + + 737, 563, 10, 10 + + + + + + + + + + + + + + 931, 98, 204, 131 + + + + + + + + + + 931, 238, 129, 66 + + + + + + + + + + 931, 28, 100, 66 + + + + + + + + + + 931, 315, 132, 66 + + + + + + + H4sIAAAAAAAAAFPmUg7JKFVwLChSMLBUMDS1AiIjQwVXlxAFIwMjAy4AeUV7gSAAAAA= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_18_5_2_8c5028b_1506531077285_665817_5189"/> + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_18_5_2_8c5028b_1541008090722_724767_5273"/> + + + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> + + + + + + + + + + + + + + + H4sIAAAAAAAAAM1WS4+bMBC+8yuQlivIBmNwJQ672z20h7Za5dJTZOxJcAU2MqRt/n2dLNlHNuwmbYgqIfBjxjPzzTeDr25N0/JelapW/doH3du1dzWrVv51a33EfJx+cE+M/buPMz9GMfJulOZWQRe11rRgezcsDqx5bvh7HdVG8Ho+/3b/9fPd7SyoEEJYciyDKstlHFSEYRxUZSlpUDEeL3JMkwyVdG6hMysrYC5ME0htGr5UIpDbj7T8VyBXTT1fNUZCHciu4hbk01TztqtMX/wPTkyEhFDOEej5YM0Z+QGinzz298x6Lv+d0bwOnV40qEWPiEXCWIgGrci0vTLa0WbQGdaH5eJ8R3knnOBEG6P3XPlH/TEOlCItE9imQbqUEIJIUOUsdW+KERKMcBnz7EQiHlkFFzE+hjwMOAknDnqpNIBVejkG9Ij4yOkbf7Z+RENNbicjZx8WHsmYJIymZc6DCmK+AY0z5kCTmQNtIfM8TTIhYsIm7V+XdeIFxkJFDz7tdiMJnbCq7Y19NnxZMMcqeUOE4Y6a4YaZ4YaY4YaX4XNaFqcI78fw2MF21bvv7yuBd5l2HMUeuLUPjutZqutBO5pvcz3A1Vr1k/cgoQUt3e66dlKvkD1FeSJW/+W/aGqzI9HmWZamObA4JguMiUyRBI4XCeNYYHzuICey5t18+nJ9/z2kFJUY5yTElHJXAkBDxkoa0iSViShLkpGkOEH2vJidpd1dxPbTveXQBfetTe8PEm154UULAAA= + + \ No newline at end of file diff --git a/uml2es/examples/umlModels/PatientHubUML.png b/uml2es/examples/umlModels/PatientHubUML.png new file mode 100644 index 0000000..f11c783 Binary files /dev/null and b/uml2es/examples/umlModels/PatientHubUML.png differ diff --git a/uml2es/examples/umlModels/PatientHubUML.xml b/uml2es/examples/umlModels/PatientHubUML.xml new file mode 100644 index 0000000..239031d --- /dev/null +++ b/uml2es/examples/umlModels/PatientHubUML.xml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + diff --git a/uml2es/tutorials/dmHubLab/step1/build.gradle b/uml2es/tutorials/dmHubLab/step1/build.gradle deleted file mode 100644 index d1952f0..0000000 --- a/uml2es/tutorials/dmHubLab/step1/build.gradle +++ /dev/null @@ -1,184 +0,0 @@ -buildscript { - repositories { - maven {url 'http://developer.marklogic.com/maven2/'} - } -} - -plugins { - id 'java' - id 'eclipse' - id 'idea' - - // This plugin allows you to create different environments - // for your gradle deploy. Each environment is represented - // by a gradle-${env}.properties file - // See https://github.com/stevesaliman/gradle-properties-plugin - // specify the env on the command line with: - // gradle -PenvironmentName=x ... - id 'net.saliman.properties' version '1.4.6' - - // This gradle plugin extends the ml-gradle plugin with - // commands that make the Data Hub Framework do its magic - id 'com.marklogic.ml-data-hub' version '4.1.0' -} - -repositories { - jcenter() - maven {url 'http://developer.marklogic.com/maven2/'} - - // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } - - // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } -} - -configurations { - // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want - // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as - // shown below. Need to force to use certain version of xml-apis library. - mlcp { - resolutionStrategy { - force "xml-apis:xml-apis:1.4.01" - } - } -} - -dependencies { - // this allows you to write custom java code that depends - // on the Data Hub Framework library - compile 'com.marklogic:marklogic-data-hub:4.1.0' - compile 'com.marklogic:marklogic-xcc:9.0.7' - - mlcp "com.marklogic:mlcp:9.0.6" - mlcp "org.apache.commons:commons-csv:1.2" - mlcp files("lib") -} - -/* - Private tasks - */ - -task prepPWIModel(type: Copy) { - from "data/papyrus/PWIModel/PWIModel.uml" - into "data/model" - rename '(.*).uml', '$1.xml' -} - -task runUML2ESDeploy(type: GradleBuild) { - buildFile = "uml2es4dhf.gradle" - tasks = ["uDeployModel"] -} - -task makeEntity(type: Copy) { - from "data/entity-services/PWIModel.json" - into "plugins/entities/Person" - rename 'PWIModel.json', 'Person.entity.json' -} - -// This is a workaround - DMUI can't open mapping unless at least two plugin entities -task makeDummyEntity(type: Copy) { - from "data/hack/X.entity.json" - into "plugins/entities/X" - rename 'PWIModel.json', 'Person.entity.json' -} - -/* - Public tasks - */ - -task loadDmIdeSampleData(type: Copy) { - from "data/persons" - into "plugins/entities/Person/harmonize/PWIMapping/samples" -} - -task deployPWIModel() { - dependsOn "prepPWIModel" - dependsOn "runUML2ESDeploy" - dependsOn "makeEntity" - dependsOn "makeDummyEntity" // workaround - tasks.findByName('runUML2ESDeploy').mustRunAfter 'prepPWIModel' - tasks.findByName('makeEntity').mustRunAfter 'runUML2ESDeploy' - tasks.findByName('makeDummyEntity').mustRunAfter 'makeEntity' // workaround -} - -task deployPWIMapping(type: com.marklogic.gradle.task.ServerEvalTask) { -def dmuiMappingURI = "/entities/Person/harmonize/PWIMapping/PWIMapping.mapping.json" -def dmfMappingURI = "/dm/mapper/PWIModel/Person/harmonizePWI.json" -def mainEntity = "Person" -def js = "'use strict';\n" -js += 'declareUpdate();\n' -js += 'const converter = require("/mapperGUILib.sjs");\n' -js += 'converter.convertDmIde2DMF("' +dmuiMappingURI + '","' + dmfMappingURI + '","' + mainEntity + '");\n' -println js - javascript = js; -} - -task ingestLookup -["Staging", "Final"].toList().each { envType -> - task "ingestLookup${envType}"(type: com.marklogic.gradle.task.MlcpTask) { - - - def port = mlStagingPort.toInteger() - def db = mlStagingDbName - - if ("${envType}" == "Final") { - port = mlFinalPort.toInteger() - db = mlFinalDbName - } - else if ("${envType}" == "Staging") { - } - else { - throw new GradleException("Illegal env ${envType}") - } - def dataDir = "${projectDir}"; - def unixDir = dataDir.replace('\\', '/'); - def regexDir = unixDir+"/data/coolness"; - def regex = '"' + regexDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - host = mlHost - port = port - database = db - - document_type = "json" - input_file_path = "data/coolness" - input_file_type = "documents" - - output_collections "Employee,LoadEmployee,input" - output_permissions "rest-reader,read,rest-writer,update" - output_uri_replace = regex - output_uri_prefix = "/" - - } - ingestLookup.dependsOn "ingestLookup${envType}" -} - -task loadPersonSourceData(type: com.marklogic.gradle.task.MlcpTask) { - def dataDir = "${projectDir}"; - def unixDir = dataDir.replace('\\', '/'); - def regexDir = unixDir+"/data/persons"; - def regex = '"' + regexDir + ",'',/,''" + '"' - - classpath = configurations.mlcp - command = "IMPORT" - host = mlHost - port = mlStagingPort.toInteger() - database = mlStagingDbName - - document_type = "json" - input_file_path = "data/persons" - input_file_type = "documents" - - output_collections "Person,input" - output_permissions "rest-reader,read,rest-writer,update" - output_uri_replace = regex - output_uri_prefix = "/" - - transform_module="/data-hub/4/transforms/mlcp-flow-transform.sjs" - transform_namespace="http://marklogic.com/data-hub/mlcp-flow-transform" - transform_param "entity-name=Person,flow-name=LoadPerson" -} - diff --git a/uml2es/tutorials/dmHubLab/step1/data/hack/X.entity.json b/uml2es/tutorials/dmHubLab/step1/data/hack/X.entity.json deleted file mode 100644 index 1f9e422..0000000 --- a/uml2es/tutorials/dmHubLab/step1/data/hack/X.entity.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "info" : { - "title" : "X", - "version" : "0.0.1", - "baseUri" : "http://example.com/", - "description" : "An X entity" - }, - "definitions" : { - "X" : { - "description" : "The X entity root.", - "required" : [ ], - "rangeIndex" : [ ], - "wordLexicon" : [ ], - "pii" : [ ], - "properties" : { } - } - } -} diff --git a/uml2es/tutorials/dmHubLab/step1/data/coolness/hobbyCoolness.json b/uml2es/tutorials/dmHubLab/step1/data/referenceData/hobbyCoolness.json similarity index 100% rename from uml2es/tutorials/dmHubLab/step1/data/coolness/hobbyCoolness.json rename to uml2es/tutorials/dmHubLab/step1/data/referenceData/hobbyCoolness.json diff --git a/uml2es/tutorials/dmHubLab/step1/gradle.properties b/uml2es/tutorials/dmHubLab/step1/gradle.properties deleted file mode 100644 index 99bb2c9..0000000 --- a/uml2es/tutorials/dmHubLab/step1/gradle.properties +++ /dev/null @@ -1,79 +0,0 @@ -mlDHFVersion=4.1.0 -mlHost=localhost -mlUsername=admin -mlPassword=admin - -mlStagingAppserverName=xmi2es-tutorials-dmHub-STAGING -mlStagingPort=14400 -mlStagingDbName=xmi2es-tutorials-dmHub-STAGING -mlStagingForestsPerHost=3 -mlStagingAuth=digest -# To enable SSL for staging -# mlStagingSimpleSsl=true - -mlFinalAppserverName=xmi2es-tutorials-dmHub-FINAL -mlFinalPort=14401 -mlFinalDbName=xmi2es-tutorials-dmHub-FINAL -mlFinalForestsPerHost=3 -mlFinalAuth=digest -# To enable SSL for final -# mlFinalSimpleSsl=true - -mlJobAppserverName=xmi2es-tutorials-dmHub-JOBS -mlJobPort=14403 -mlJobDbName=xmi2es-tutorials-dmHub-JOBS -mlJobForestsPerHost=4 -mlJobAuth=digest -# To enable SSL for jobs -# mlJobSimpleSsl=true - -mlModulesDbName=xmi2es-tutorials-dmHub-MODULES -mlModulesForestsPerHost=1 - -mlStagingTriggersDbName=xmi2es-tutorials-dmHub-staging-TRIGGERS -mlStagingTriggersForestsPerHost=1 - -mlStagingSchemasDbName=xmi2es-tutorials-dmHub-staging-SCHEMAS -mlStagingSchemasForestsPerHost=1 - -mlFinalTriggersDbName=xmi2es-tutorials-dmHub-final-TRIGGERS -mlFinalTriggersForestsPerHost=1 - -mlFinalSchemasDbName=xmi2es-tutorials-dmHub-final-SCHEMAS -mlFinalSchemasForestsPerHost=1 - -# You can override this to specify an alternate folder for your -# custom forest info. Defaults to user-config/forests/ -# mlCustomForestPath=forests - -# The name of the Role to create for Hub Access -mlHubUserRole=data-hub-role -mlHubUserName=data-hub-user -# this password is autogenerated for you via the 'gradle hubInit' task -mlHubUserPassword=g?E)I^h67^hH{QqN2jY[ - -# The name of the role to create for hub deployment/development -mlHubAdminRole=hub-admin-role -mlHubAdminUserName=hub-admin-user -mlHubAdminUserPassword=?t4K$z-W5gjb@PI31(wj - -# Deprecated property -# If you are working with a load balancer please indicate so using -# property "mlIsHostLoadBalancer" -# When "mlIsHostLoadBalancer" is set to "true", the value specified for "mlHost" will be used as the load balancer. -# You do not need to explicitly set the value of "mlLoadBalancerHosts" but if you do it must match the value of the property "mlHost" -# mlLoadBalancerHosts=your-load-balancer-hostname - -# Default module permissions which allow data-hub-role to execute flows -mlModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,data-hub-role,read,data-hub-role,execute - -# If DHF is running in a provisioned environment please specify it here -# mlIsProvisionedEnvironment=false - - -# App-specific properties -modelName=PWIModel -entityName=Person -dmPath=data/dmtemplate -dataFormat=json -pluginFormat=sjs diff --git a/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/root/mapperGUILib.sjs b/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/root/mapperGUILib.sjs deleted file mode 100644 index b604c4a..0000000 --- a/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/root/mapperGUILib.sjs +++ /dev/null @@ -1,98 +0,0 @@ -const dm = require('/ext/declarative-mapper.sjs'); - -/* -This module converts DM IDE mapping to Nic Gibson json-sc DM template format. -It's a workaround: Ivo/Stelian tool does not support DM IDE to DM json-sc format. -The mapping world at ML is moving fast. This module serves a purpose at a moment -in time and will soon by OBSOLETE. -DON'T USE THIS! -*/ - -//declareUpdate(); - -function convertDmIde2DMF(dmuiMappingURI, dmfMappingURI, mainEntity) { - var doc = fn.head(xdmp.eval('cts.doc(dmuiMappingURI)', {dmuiMappingURI: dmuiMappingURI}, {'database': xdmp.modulesDatabase()})); - if (!doc || doc == null) throw "Not found in modules DB: *" + dmuiMappingURI + "*"; - var dmTemplate = buildDMTemplate(doc, mainEntity, true); - xdmp.documentInsert(dmfMappingURI, dmTemplate, { - "collections": ["dm", "cookieCutter", /* "http://marklogic.com/entity-services/models", */ mainEntity], - "permissions": xdmp.documentGetPermissions(dmuiMappingURI) - }); -} - -function convertDmIde2DMF4Test(dmuiMapping, mainEntity) { - return buildDMTemplate(dmuiMapping, mainEntity, false); -} - -function buildDMTemplate(dmuiTemplate, mainEntity, includeClassNames) { - return { - "input": { - "format": "json" - }, - "outputs": { - "main": { - "format": "json", - "content": [ - buildEntity(dmuiTemplate, mainEntity, includeClassNames), - {} - ] - } - } - }; -} - -function buildEntity(doc, entityName, includeClassNames) { - var props = doc.xpath("//definitions/" + entityName + "/properties/*/node-name()"); - var content = {}; - var root = content; - var theOneCondition = null; - if (includeClassNames == true) { - content[entityName] = {}; - root = content[entityName]; - } - for (var prop of props) { - var sprop = ("" + prop).trim(); - if (sprop == "") continue; - var propDef = fn.head(doc.xpath("//definitions/" + entityName + "/properties/" + sprop)); - - var condition = fn.head(propDef.xpath("coalesce/condition")); - if (condition && condition != null && (""+condition) != "") { - if (theOneCondition == null) { - theOneCondition = ""+condition; - } - else if (theOneCondition != condition) { - throw "Multiple conditions *" + theOneCondition + "*" + condition + "*"; - } - } - - var expression = fn.head(propDef.xpath("coalesce/expression")); - if (expression && expression != null && (""+expression) != "") { - root[sprop] = ""+expression; - } - else { - var ref = fn.head(propDef.xpath("*[string(node-name(.)) eq '$ref']")); - if (ref && ref != null && ""+ref != "") { - var toks = (""+ref).split("/"); - ref = toks[toks.length - 1]; - root[sprop] = buildEntity(doc, ref, includeClassNames); - } - } - } - - if (theOneCondition == null) return content; - else return [theOneCondition, content]; -} - -function runDMMappingTest(dmTemplate, source) { - var ctx = dm.newCompilerContext(dmTemplate); - var mapper = dm.prepare(ctx); - var mapping = mapper(source); - return mapping[0]; -} - -module.exports = { - convertDmIde2DMF : convertDmIde2DMF, - convertDmIde2DMF4Test: convertDmIde2DMF4Test, - runDMMappingTest: runDMMappingTest -}; - diff --git a/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/services/evalSampleDHF-ft.sjs b/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/services/evalSampleDHF-ft.sjs deleted file mode 100644 index 350a18f..0000000 --- a/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/services/evalSampleDHF-ft.sjs +++ /dev/null @@ -1,55 +0,0 @@ -const util = require("/mapperGUILib.sjs"); -const dhfConfig = require("/com.marklogic.hub/config.sjs"); - -function normalizeInput(payload, params) { - return (payload instanceof Sequence) ? payload.toArray()[0] : - (Array.isArray(payload) ? payload[0] : payload); -} - -function errorHandler(statusCode, statusMsg, body) { - fn.error(null, 'RESTAPI-SRVEXERR', Sequence.from([statusCode, statusMsg, body])); -} - -function userError(msg) { errorHandler(400, "Input error", msg);} - -function paramInput(params, attrib) { - if (params[attrib] && params[attrib] != null) { - var val = ("" + params[attrib]).trim(); - if (val.length > 0) return val; - } - userError("Missing required input: " + attrib); -} - -function post(context, params, input) { - - input = xdmp.unquote(input); // IDE passes as string - xdmp.log("evalSampleDHF-ft params " + JSON.stringify(params)); - xdmp.log("evalSampleDHF-ft input " + input); - - // collect input - var entityName = paramInput(params, "entityName"); - var mappingName = paramInput(params, "mappingName"); - var sample = paramInput(params, "sample"); - var ninput = normalizeInput(input); - - context.outputTypes = ["application/json"]; - - // obtain source - var sourceURI = `/entities/${entityName}/harmonize/${mappingName}/samples/${sample}`; - var source = fn.head(xdmp.eval('cts.doc(sourceURI)', {sourceURI: sourceURI}, {database: xdmp.database(dhfConfig.MODULESDATABASE)})); - if (!source || source == null) userError("Sample not found *" + sourceURI + "*"); - - // get DM mapping and run mapper - var dmTemplate = util.convertDmIde2DMF4Test(ninput, entityName); - var ret = {}; - - xdmp.log("evalSampleDHF-ft test " + JSON.stringify(dmTemplate)); - xdmp.log("evalSampleDHF-ft on " + JSON.stringify(source)); - - ret[sample] = util.runDMMappingTest(dmTemplate, source); - - xdmp.log("evalSampleDHF-ft ret " + JSON.stringify(ret)); - return xdmp.quote(ret); // IDE wants it back as string -} - -exports.POST = post; \ No newline at end of file diff --git a/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/services/saveSampleDataSvc.sjs b/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/services/saveSampleDataSvc.sjs deleted file mode 100644 index 6b9ce27..0000000 --- a/uml2es/tutorials/dmHubLab/step1/src/main/ml-modules/services/saveSampleDataSvc.sjs +++ /dev/null @@ -1,42 +0,0 @@ -const dhfConfig = require("/com.marklogic.hub/config.sjs"); - -function normalizeInput(payload, params) { - return (payload instanceof Sequence) ? payload.toArray()[0] : - (Array.isArray(payload) ? payload[0] : payload); -} - -function errorHandler(statusCode, statusMsg, body) { - fn.error(null, 'RESTAPI-SRVEXERR', Sequence.from([statusCode, statusMsg, body])); -} - -function userError(msg) { errorHandler(400, "Input error", msg);} - -function paramInput(params, attrib) { - if (params[attrib] && params[attrib] != null) { - var val = ("" + params[attrib]).trim(); - if (val.length > 0) return val; - } - userError("Missing required input: " + attrib); -} - -function post(context, params, input) { - - xdmp.log("saveSampleDataSvc params " + JSON.stringify(params)); - xdmp.log("saveSampleDataSvc input type " + xdmp.type(input)); - - input = xdmp.unquote(JSON.parse(input).content); - - xdmp.log("saveSampleDataSvc input " + JSON.stringify(input)); - - // collect input - var entityName = paramInput(params, "entityName"); - var mappingName = paramInput(params, "mappingName"); - var sample = paramInput(params, "sample"); - - // obtain source - var sourceURI = `/entities/${entityName}/harmonize/${mappingName}/samples/${sample}`; - xdmp.eval('xdmp.documentInsert(sourceURI, source)', {sourceURI: sourceURI, source:input}, - {database: xdmp.database(dhfConfig.MODULESDATABASE), isolation:"different-transaction", update:"true"}); -} - -exports.POST = post; \ No newline at end of file diff --git a/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.notation b/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.notation index 66e6549..ff5073d 100644 --- a/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.notation +++ b/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.notation @@ -1,5 +1,5 @@ - + @@ -75,6 +75,14 @@ + + + + + + + + @@ -112,4 +120,14 @@ + + + + + + + + + + diff --git a/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.uml b/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.uml index 6961d34..f5c5d3c 100644 --- a/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.uml +++ b/uml2es/tutorials/dmHubLab/step2/PWIModel/PWIModel.uml @@ -1,6 +1,6 @@ - - + + @@ -35,7 +35,7 @@ - + @@ -43,6 +43,6 @@ - - + + diff --git a/uml2es/tutorials/dmHubLab/step4/PWIMapping/PWIMapping.mapping.json b/uml2es/tutorials/dmHubLab/step4/PWIMapping/PWIMapping.mapping.json deleted file mode 100644 index b5f0027..0000000 --- a/uml2es/tutorials/dmHubLab/step4/PWIMapping/PWIMapping.mapping.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "info": { - "title": "PWIMapping", - "version": "0.0.0", - "engine": { - "name": "mapper.sch", - "version": "1.0.1" - }, - "source": {}, - "target": {}, - "description": "" - }, - "pathNamespaces": {}, - "collector": {}, - "contexts": {}, - "definitions": { - - "Person": { - "properties": { - "id": { - "enabled": true, - "coalesce": [ - { - "expression": "[[ concat('/pwi/', extract('//id'), '.json') ]]", - "condition": "" - } - ] - }, - "firstName": { - "enabled": true, - "coalesce": [ - { - "expression": "[[ extract('//first_name') ]]", - "condition": "" - } - ] - }, - "lastName": { - "enabled": true, - "coalesce": [ - { - "expression": "[[ extract('//last_name') ]]", - "condition": "" - } - ] - }, - "hobbies": { - "$ref": "#/definitions/Hobby" - }, - "": { - "enabled": true - } - }, - "required": [] - }, - "Hobby": { - "properties": { - "name": { - "enabled": true, - "coalesce": [ - { - "expression": "[[extract('.') ]]", - "condition": "%%[[extract('//hobbies', true)]]" - } - ] - }, - "coolness": { - "enabled": true, - "coalesce": [ - { - "expression": "[[ lookup('/hobbyCoolness.json', extract('.')) ]]", - "condition": "" - } - ] - } - } - } - - } -} \ No newline at end of file diff --git a/uml2es/tutorials/dmHubLab/step5/harmonizePWI.json b/uml2es/tutorials/dmHubLab/step5/harmonizePWI.json deleted file mode 100644 index 591862f..0000000 --- a/uml2es/tutorials/dmHubLab/step5/harmonizePWI.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "input": { - "format": "json" - }, - "outputs": { - "main": { - "format": "json", - "content": [ - { - "Person": { - "id": "[[ concat('/pwi/', extract('//id'), '.json') ]]", - "firstName": "[[ extract('//first_name') ]]", - "lastName": "[[ extract('//last_name') ]]", - "hobbies": [ - "%%[[extract('//hobbies', true)]]", - { - "name": "[[extract('.') ]]", - "coolness": "[[ lookup('/hobbyCoolness.json', extract('.')) ]]" - } - ] - } - } - ] - } - } -} diff --git a/uml2es/tutorials/dmui.md b/uml2es/tutorials/dmui.md index 3d38401..b948d47 100644 --- a/uml2es/tutorials/dmui.md +++ b/uml2es/tutorials/dmui.md @@ -4,7 +4,7 @@ This tutorial shows how you, *without having to write any code*, can move raw, messy data into MarkLogic and convert it to a much better form that conforms to a UML model. Our approach can best be described as *model-driven declarative mapping*. There's no coding; developers aren't needed. Rather, the brunt of the work is done by the two roles you would expect: - A data architect, who creates the data model in a third-party UML tool (in our case, Papyrus). -- A source-data subject-matter expert (SME), who uses the Declarative Mapper IDE tool to define the source-to-target mapping. This SME is an expert in the messy source data and works closely with the data architect to understand the UML-defined target data format. +- A source-data subject-matter expert (SME), who uses the Data Hub's mapper tool to define the source-to-target mapping. This SME is an expert in the messy source data and works closely with the data architect to understand the UML-defined target data format. The data architect and source-data SME are helped by a build person, who creates a gradle-based MarkLogic data hub environment that incorporates the UML and mapping tools. @@ -16,70 +16,127 @@ A) The data architect in Papyrus creates the UML data model. B) The data architect, using the build environment created by the build person, uses UML2ES to convert the UML model to MarkLogic's Entity Services (ES) form. -C) The source-data SME works within the Declarative Mapper IDE tool to map source data to the model form (UML, ES) of the data. +C) The source-data SME works within the Data Hub QuickStart tool to map source data to the model form (UML, ES) of the data. -D) The source-data SME works with the build person to incorporate the source data SME's declarative mapping into a data hub harmonization process. When this harmonization process is run, the raw source data is converted to the model's form using the declarative mapping. +D) The data flow to stage raw source person data, map it to the model's form, and persist that model-based data to the hub's FINAL database, is executed. In the tutorial we'll run it manually within Quick Start. It is simple enough step for any of the roles to execute. In a production environment, its execution is likely scripted by the build person. There's no coding in this process... not even in step D! All the work is done by data experts and tools! To see why, try out this tutorial! You will play each of the roles through all the above steps. -For this tutorial you need MarkLogic (version 9 or later), UML2ES, Papyrus (an open-source UML tool), the Declarative Mapper IDE (a MarkLogic field tool), and the Declarative Mapper engine (another MarkLogic field tool). [The two Declarative Mapper tools are available on MarkLogic's internal BitBucket repository. This tutorial is MarkLogic internal.] +For this tutorial you need MarkLogic (version 9 or later), UML2ES, Papyrus (an open-source UML tool), and the Data Hub 5.1 QuickStart tool. - You will need a local clone of UML2ES - See [How to install Papyrus](papyrus_install.md) for instructions on installing Papyrus -- See [How to install Declarative Mapper](dm_install.md) for instructions on installing the Declarative Mapper UI and engine -## Why is this Tutorial Under Construction - -Model-based mapping is soon to be a built-in feature of MarkLogic. In this tutorial we use a separate field tool, the Declarative Mapper. This tutorial will soon be revised to use the built-in MarkLogic mapper. - -The DM IDE tool is ever-changing. In this tutorial we use it as a visual editor for the Declarative Mapper field tool. Currently it is intended to fit multiple mapping engines: not just Declarative Mapper, but also Schematron. But DM IDE could grow into a UI editor for MarkLogic's built-in mapper. When that happens, this tutorial will show how the source data SME uses DM IDE to create a mapping for the MarkLogic mapper! - -And to top it off - the DM IDE doesn't integrate with UML2ES in DHF 4.3. You have to use DHF 4.1. - -## Step 1: Standup a MarkLogic Environment and Build Process (Build Person) +## Step 1: Standup a MarkLogic Data Hub (Build Person)
Click to view/hide this section

-We get started by having you, in the role of build person, setup a data hub, with UML2ES and the Declarative Mapper, on MarkLogic. +We get started by having you, in the role of build person, setup a data hub, with UML2ES, on MarkLogic. Pre-requisites: - MarkLogic 9 (or greater) installation up and running - Local clone of UML2ES -- Local clone of Declarative Mapper engine. See [How to install Declarative Mapper](dm_install.md) -- Declarative Mapper IDE up and running. First obtain a local clone. Then setup and run. See [How to install Declarative Mapper](dm_install.md) +- Data Hub Framework 5.1 QuickStart -To begin, create a folder called dmHub anywhere on your build machine. This folder will be a data hub gradle project that incorporates the UML2ES and the DM toolkits. +## Step 1a: Create an environment in Quick Start -Copy into the dmHub folder the entire contents (preserving directory structure) of [dmHubLab/step1](dmHubLab/step1). You did the copy correctly if you see build.gradle and data/coolness/hobbyCoolness.json directly under dmHub. Otherwise, remove what you copied and try again at the correct level. +To begin, open Quick Start 5.1 in your browser and create a new project. Put it into a folder called dmHub. Once your new hub is up and running, you're ready to continue. -What you just copied is the gradle build file, the gradle properties file, the log4j properties file, the source person data, and some miscellaneous artifacts. Tweak the gradle.properties once you've copied it over. For example, modify mlHost if you're ML server is not running on localhost; modify mlUsername and mlPassword if your admin username/password is not admin/admin. +## Step 1b: Copy into project UML2ES source code, reference data, and sample source data -Copy into dmHub/src/main/ml-modules/root the UML2ES transform code [../uml2esTransform/src/main/ml-modules/root/xmi2es](../uml2esTransform/src/main/ml-modules/root/xmi2es). You did it right if you can see the file dmHub/src/main/ml-modules/root/xml2es/xml2esTransform.xqy. If you don't see the file in exactly that this location, remove what you copied and try again at the correct level. +Next copy into the dmHub folder the entire contents (preserving directory structure) of [dmHubLab/step1](dmHubLab/step1). You did the copy correctly if you see data/persons/person*.json, data/referenceData/hobbyCoolness.json, and log/log4j/properties directly under dmHub. -Copy into dmHub/src/main/ml-modules/ext the Declarative Mapper engine code. Copy from your local DM engine clone the directory declarative-mapper/src/main/ml-modules/root/ext to dmHub/src/main/ml-modules/root/ext. You did it right if you can see dmHub/src/main/ml-modules/root/ext/declarative-mapper.sjs and dmHub/src/main/ml-modules/root/ext/declarative-mapper/runtime.sjs. If you don't see the files in exactly that this location, remove what you copied and try again at the correct level. +Copy into dmHub/src/main/ml-modules/root the UML2ES transform code [../uml2esTransform/src/main/ml-modules/root/xmi2es](../uml2esTransform/src/main/ml-modules/root/xmi2es). You did it right if you can see the file dmHub/src/main/ml-modules/root/xml2es/xml2esTransform.xqy. If you don't see the file in exactly that this location, remove what you copied and try again at the correct level. -Copy into the main folder dmHub the UML2ES build file [../uml2esTransform/uml2es4dhf.gradle](../uml2esTransform/uml2es4dhf.gradle). +Copy into the main folder dmHub the UML2ES build file [../uml2esTransform/uml2es4dhf5.gradle](../uml2esTransform/uml2es4dhf5.gradle). Under dmHub/data, create subfolders model and papyrus Copy into dmHub/data/papyrus the UML2ES profile [../umlProfile/eclipse/MLProfileProject](../umlProfile/eclipse/MLProfileProject). You did it right if you can see the file dmHub/data/papyrus/MLProfileProject/MLProfile.profile.uml. If you don't see the file in exactly that location, remove what you copied and try again at the correct level. -When you are done, you should have the following folder structure: ... TODO - update; add service folder, remove hack +When you are done, you should have the following folder structure: ![Step 1 - folder structure](images/dmui_setup1.png) -Now let's initialize the hub. In a command prompt navigate to your employeeHub folder and run the following: +## Step 1c: Deploy UML2ES source code and reference data + +After setting up the hub above, you copied UML2ES source code into the project. To conclude the setup, push that code to the server! Also, as part of the same step, ingest the file data/referenceData/hobbyCoolness.json to the staging database; more on the purpose of this in section 4 below. + +First, edit gradle.properties to supply values for mlUsername and mlPassword. + +Next, edit build.gradle by adding a gradle task to ingest hobbyCoolness. You will also need to specify a dependency for MLCP. Here is what your build.gradle should look like: + +``` +buildscript { + repositories { + maven {url 'http://developer.marklogic.com/maven2/'} + } +} + +plugins { + id 'java' + id 'eclipse' + id 'idea' + + // This plugin allows you to create different environments + // for your gradle deploy. Each environment is represented + // by a gradle-${env}.properties file + // See https://github.com/stevesaliman/gradle-properties-plugin + // specify the env on the command line with: + // gradle -PenvironmentName=x ... + id 'net.saliman.properties' version '1.4.6' + + // This gradle plugin extends the ml-gradle plugin with + // commands that make Data Hub do its magic + id 'com.marklogic.ml-data-hub' version '5.1.0' +} + +repositories { + jcenter() + maven {url 'http://developer.marklogic.com/maven2/'} +} + +configurations { -gradle -i hubInit + // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want + // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as + // shown below. Need to force to use certain version of xml-apis library. + mlcp { + resolutionStrategy { + force "xml-apis:xml-apis:1.4.01" + } + } +} -This creates a few additional subfolders: plugins, src/main/hub-internal-config, src/main/ml-config, src/main/ml-schemas, build, gradle, and .gradle. +dependencies { + // this allows you to write custom java code that depends + // on the Data Hub library + compile 'com.marklogic:marklogic-data-hub:5.1.0' + compile 'com.marklogic:marklogic-xcc:9.0.7' -Finally, let's create an instance of the data hub. In the command prompt, run the following + mlcp "com.marklogic:mlcp:9.0.10" + mlcp "org.apache.commons:commons-csv:1.2" + mlcp files("lib") +} -gradle -i mlDeploy +task loadRef(type: com.marklogic.gradle.task.MlcpTask) { + classpath = configurations.mlcp + username = project.findProperty("mlUsername") + password = project.findProperty("mlPassword") + command = "IMPORT" + database = project.findProperty("mlStagingDbName") + input_file_path = "data/referenceData/hobbyCoolness.json" + output_collections = "referenceData" + output_permissions = "rest-reader,read,rest-writer,update" + output_uri_replace = ".*data,''" +} +``` + +Finally, from the command line, run the following gradle command to promote UML2ES and reference data; make sure to run this from your dmHub project folder. + +./gradlew -i mlReloadModules loadRef -When this has completed, you should see in your MarkLogic environment several new databases, including xmi2es-tutorials-dmHub-STAGING, xmi2es-tutorials-dmHub-FINAL, and xmi2es-tutorials-dmHub-MODULES. Check in admin console you have these.

@@ -117,9 +174,9 @@ Click Next. In the next window enter the project name as PWIModel. Select the mo ![New project in Papyrus](images/dmui_setup4.png) -Click Next. In the next page, under Diagram Kind, select Class Diagram. Click the box "A UML model with basic primitive types." Under "Choose a profile to apply", select Browse Workspace and select MLProjectProfile|MLProfile.profile.uml. +Click Next. In the next page, for Root Model Element Name, enter PWIModel (replacing RootElement). Under Diagram Kind, select Class Diagram. Click the box "A UML model with basic primitive types." Under "Choose a profile to apply", select Browse Workspace and select MLProjectProfile|MLProfile.profile.uml. -![New project in Papyrus](images/emp_setup5.png) +![New project in Papyrus](images/dmui_setup5.png) Click Finish. In Papyrus, you now see two projects in your workspace: @@ -189,11 +246,15 @@ In the same Properties window select UML and change the name from Root Element t ![Root element](images/dmui_setup17.png) -Physically in MarkLogic, instances of the Person class are documents. Let's designate the id attribute as the URI of the document. Configuring this is straightforward; follow the same step as when setting id as PK. You end up with the following: +Finally, let's indicate that the Person class is meant to be a primary entity in DHF. That is, in DHF, we will be building Person documents. A Person contains zero or more Hobby instances. Hobby is not a primary entity. There are no hobby documents; a hobby lives as a sub-document of Person. We therefore stereotype the Person class as xDHFEntity. Select the Person class. Under Properties select Profile. Under Applied Stereotype add xDHFEntity. + +![Final model](images/dmui_setup17a.png) + +Here is the final model: ![Final model](images/dmui_setup18.png) -We are done modelling. Click File | Save All. +We are done modeling. Click File | Save All. If you think you might have messed up along the way, a pre-cooked model is available under [dmHubLab/step2/PWIModel](dmHubLab/step2/PWIModel). If you want it in your workspace, the simplest way is to copy each of its files over yours. You can also delete the PWIModel project from your workspace (by right-clicking the project and selecting Delete, but keeping the contents!) and import the pre-cooked project (File | Import | Existing Projects Into Workspace). @@ -205,11 +266,11 @@ If you think you might have messed up along the way, a pre-cooked model is avail
Click to view/hide this section

-Next, as the data architect, with help from the build person, you will convert the UML model you created in Step 2 to a MarkLogic Entity Services model. Run the following from the command line in the gradle project folder that the build person created in Step 1. +Now it's time to convert the UML model to Entity Services form. This is best done by running a Gradle command from the command line. Make sure you are in the dmHub project folder. Run the following. (You need to give the path to your PWIModel.uml file; replace MYPATH with the actual path on your machine in which PWIModel/PWIMode.uml is kept. -gradle -i deployPWIModel +./gradlew -i -b uml2es4dhf5.gradle uDeployModelToDHF -PmodelFile=MYPATH/PWIModel/PWIModel.uml -PentitySelect=all #should be stereotype, but DHF wants every entity used in mapping (even secondary entities like hobby) to live in its ES definition -That command should run successfully; you should see "BUILD SUCCESSFUL" when its completes. The UML model has been convereted to ES and is setup as a data hub plugin. You can see the ES model in a few places. If you open Query Console and explore the xmi2es-tutorials-dmHub-FINAL database, its URI is /marklogic.com/entity-services/models/PWIModel.json. In your gradle project the same ES model is in plugins/entities/Person/Person.entity.json. +Lots of things happen when you run this. If there were no issues, you will find a new file, called Person.entity.json, in the entities folder of you dmHub project.

@@ -219,147 +280,86 @@ That command should run successfully; you should see "BUILD SUCCESSFUL" when its
Click to view/hide this section

-In Step 4 you play the role of Source Data SME. Using the Declarative Mapper IDE, you map source data to the form of the UML PWI model created in Step 3. +In Step 4 you play the role of Source Data SME. You will use the Quick Start tool to build a mapping of raw source person data to the Person structure of the UML model. -## Step 4a: Build the Mapping +## Step 4a: Ingest Source Data -First, open the DM IDE tool; see [How to install Declarative Mapper](dm_install.md) for instructions. In the initial screen ("Recent Projects"), paste in the fully path of your gradle project. Then click the + button. +First you need source data. Your mapping will transform this source data to the model form of the data. In Quick Start, navigate to Flows. Under Flows, click New Flow. Call it IngestMap. Click Create. -![IDE initial](images/dmui_setup20.png) +![New Flow](images/dmui_setup100.png) -In the next screen, in the bottom left corner, click the Folder button. +In your new flow create an ingestion step called IngestPerson. It will ingest person JSON documents from the data/person folder of your dmHub project. The configuration of this step should resemble the following: -![IDE folder prompt](images/dmui_setup21.png) +![IngestPerson](images/dmui_setup101.png) -This takes you back to Recent Projects. Click on the eye button. +Run the flow to ingest this data to your Staging database. When it completes, browse your Staging database. Confirm there are two person documents in the IngestPerson collection. -![IDE eye prompt](images/dmui_setup22.png) +## Step 4b: Design Mapping -The next screen shows you the entities in the project. Click on Person. +Add a second step, of type Mapping, to your flow. Call it MapPerson. It draws its source data from collection IngestPerson. Its target entity is Person. -![Person prompt](images/dmui_setup23.png) +![Create MapPerson](images/dmui_setup104.png) -Under mappings, create a new mapping called PWIMapping. In the "Mapping name" text box type PWIMapping. Under actions, click +. +Then build the mapping as shown below. -![PWI mapping](images/dmui_setup24.png) +![MapPerson](images/dmui_setup105.png) -On the bottom select the PWIMAPPING tab. This brings up the PWI Mapping editor: +Notice the following: -![PWI mapping editor](images/dmui_setup25.png) - -Time to map! First, understand the source data. Look at person1.json in the data/persons directory of your gradle project (also in [dmHubLab/step1/data/persons](dmHubLab/step1/data/persons)): - -{ - id: "123", - first_name: "mike", - last_name: "havey", - hobbies: [ - "swimming", - "banking", - "paragliding" - ] -} - -Conceptually, the mapping to the model works as follows: -- id, first_name, last_name in the source are mapped to the id, firstName, and lastName attributes of the Person entity. Well, id is not mapped exactly as is. Rather, the Person.id attribute is the concatenation of "/pwi/", the id source value and ".json". Person.id ends up looking like a URI. -- In the source object, hobbies is an array of strings (hobby names). In the model form, Person.hobbies is an array of Hobby objects, each consisting of a name and coolness. The source document has only the names. Coolness is determined by a lookup on the hobbyCoolness.json document in the data/coolness directory of your gradle project (also in [dmHubLab/step1/data/coolness](dmHubLab/step1/data/coolness)). +- Some obvious mappings: first_name -> firstName, last_name -> lastName, id -> id +- In the source data, hobbies is an array of strings (e.g., swimming, banking). In the target, hobbies is an array of Hobby objects, which contains attributes name and coolness. For each source hobby there is one target hobby. Hence in target we map the hobbies attribute to the source hobbies array. +- In the target hobby, name is just the corresponding hobby string in the the source. Hence, we map name to "." This means that the hobby name is the value of the corresponding hobby in the source. +- In the target hobby, coolness is a numeric value determined by hobby name. Different hobbies have difference values of coolness. We specify this in a dictionary called hobbyCoolness.json. Recall you dealt with this dictionary in step 1. Here are its contents: +``` { - "swimming": 1, - "banking": 3, - "steely-dan": 1000000, - "paragliding": 100000, - "scotch": 100000, - "yoga": 0 + "swimming": 1, + "banking": 3, + "steely-dan": 1000000, + "paragliding": 100000, + "scotch": 100000, + "yoga": 0 } - - -Now that you understand how the mapping should work, use the DM IDE tool to create the mapping for real. Use the grammar of the Data Hub Framework field tool. Under Person, select id. In the editor on the right, under Expression, type [[ concat('/pwi/', extract('//id'), '.json') ]] - -![PWI id mapping](images/dmui_setup26.png) - -In a similar way, map first_name to [[ extract('//first_name') ]] and last_name to [[ extract('//last_name') ]] - -The hobby array requires special care. Click on the name attribute. Under expression enter [[extract('.') ]] Under condition enter %%[[extract('//hobbies', true)]] The condition is an array iterator; each hobby will iterate over the list of hobby names (//hobbies) in the source. The name expression is just the value of the name. - -![PWI hobby mapping](images/dmui_setup27.png) - -For coolness, enter the expression: [[ lookup('/hobbyCoolness.json', extract('.')) ]] Coolness is the numeric value corresponding to the hobby name in hobbyCoolness.json. You don't need to enter a condition for coolness; it uses the same condition as name. - -Click the save button (bottom left corner) to save your mapping. It gets saved to plugins/entities/Person/harmonize/PWIMapping/PWIMapping.mapping.json file in your gradle project. If you think you messed up, you can get the correct mapping file from [dmHubLab/step4/PWIMapping/PWIMapping.mapping.json](dmHubLab/step4/PWIMapping/PWIMapping.mapping.json); copy it into plugins/entities/Person/harmonize/PWIMapping/PWIMapping.mapping.json - -## Step 4b: Test the Mapping Within IDE - -First, load the sample documents by running: - -gradle -i loadDmIdeSampleData mlReloadModules - -Run mlWatch to auto-detect and deploy changes to the sample documents: - -gradle -i mlWatch - -Restart the DM IDE and select PWIMapping. In the left panel, select person1.json. - -![Sample in IDE](images/dmui_setup28.png) - -In the center panel, just above the mapping, click the Refresh button. Wait a few seconds. You will see the results of the mapping applied to the sample document as green-shaded text within the mapping. - -![Sample result in IDE](images/dmui_setup29.png) - -Edit the source document in the left panel of the IDE. Make the id "123abc". Also change the hobbies to contain only "yoga" and "steely-dan". When done, click the save button. - -![Modified sample in IDE](images/dmui_setup30.png) - -Wait a minute. Then click the Refresh button again. You will see slightly different results in the green-shaded text. - -![Modified sample result in IDE](images/dmui_setup31.png) +``` +- To obtain the value from the dictionary, we use this expression: documentLookup(., '/referenceData/hobbyCoolness.json' )

-## Step 5: Ingest and Harmonize Data (Build Person) +## Step 5: Harmonize Person Data
Click to view/hide this section

-As the build person you now ingest and harmonize the data using the model and the mapping. You don't write any code. It's all gradle from here on out. +It's easy in Quick Start to run the mapping step to populate model-based Person documents into the FINAL database. Just click Run. In the Run Flow popup, select just MapPerson to run; you can skip IngestPerson, which you already ran above. -First let's create a DHF input flow to ingest our Person source data into STAGING. Also, let's create a DHF harmonization flow to harmonize that data to FINAL from the source data. Run the following commands; if you are still running mlWatch (from the previous step), cancel it (Ctrl-C): +![Run MapPerson](images/dmui_setup106.png) -gradle -i hubCreateInputFlow -PflowName=LoadPerson -PuseES=false - -gradle -b uml2es4dhf.gradle -i uCreateDHFHarmonizeFlow -PflowName=harmonizePWI -PcontentMode=dm - -You just generated a bunch of code. The good news is, you won't need a developer to touch it. The Input Flow ingests the data as is. The harmonization produces data that conforms to the UML model using the mapping from Step 4. You do need to "deploy" that mapping: - -gradle -i mlReloadModules deployPWIMapping ### DOES NOT WORK in DHF 4.3 because of how module load works. - -Next, ingest the source person data in the data/persons directory (as well as the hobbyCoolness lookup in data/lookup). We'll create a DHF input flow and run MLCP to ingest the person data through that flow. - -gradle -i loadPersonSourceData ingestLookup - -If you look in the staging database (xmi2es-tutorials-dmHub-STAGING), you will see the ingested files /person1.json, /person2.json, and /hobbyCoolness.json. - -![After source ingestion](images/dmui_setup50.png) - -Last, but not least, run the harmonization: - -gradle -i hubRunFlow -PflowName=harmonizePWI - -If you now explore the FINAL database (xmi2es-tutorials-dmHub-FINAL), you will see two new documents in the Person collection. Their URIs are /pwi/123.json and /pwi/456.json. How did they end up with these URIs? - In the model we designated the id attribute as the "xURI". In the mapping, we defined id as the concatenation of "/pwi", the value of the id attibute from the source document, and ".json". - -Click on /pwi/123.json to see its contents. +Now let's look at the data. Select the Browse Data menu. From the top-center dropdown select the FINAL database. From the collection filters on the left select MapPerson. Click on one of the two documents shown. Notice its structure adheres to the model. ``` { "envelope": { - "headers": {}, + "headers": { + "sources": [ + { + "name": "IngestMap" + } + ], + "createdOn": "2019-12-05T14:37:01.142267-05:00", + "createdBy": "admin" + }, "triples": [], "instance": { + "info": { + "title": "Person", + "version": "0.0.1", + "baseUri": "http://xyz.org/marklogicModels", + "description": "" + }, "Person": { - "id": "/pwi/123.json", - "firstName": "mike", - "lastName": "havey", + "firstName": "mikey", + "lastName": "jordan", "hobbies": [ { "Hobby": { @@ -375,14 +375,20 @@ Click on /pwi/123.json to see its contents. }, { "Hobby": { - "name": "paragliding", - "coolness": 100000 + "name": "yoga", + "coolness": 0 + } + }, + { + "Hobby": { + "name": "steely-dan", + "coolness": 1000000 } } - ] + ], + "id": "456" } - }, - "attachments": null + } } } ``` diff --git a/uml2es/tutorials/employeeCradleToGrave.md b/uml2es/tutorials/employeeCradleToGrave.md index ff42fa4..e94f178 100644 --- a/uml2es/tutorials/employeeCradleToGrave.md +++ b/uml2es/tutorials/employeeCradleToGrave.md @@ -46,7 +46,7 @@ Under employeeHub/src/main/ml-modules, create the subfolder root. Copy into employeeHub/src/main/ml-modules/root the UML2ES transform code [../uml2esTransform/src/main/ml-modules/root/xmi2es](../uml2esTransform/src/main/ml-modules/root/xmi2es). You did it right if you can see the file employeeHub/src/main/ml-modules/root/xml2es/xml2esTransform.xqy. If you don't see the file in exactly that the location, remove what you copied and try again at the correct level. -Copy into the main folder employeeHub the UML2ES build file [../uml2esTransform/uml2es4dhf.gradle](../uml2esTransform/uml2es4dhf.gradle). +Copy into the main folder employeeHub the UML2ES build file [../uml2esTransform/uml2es4dhf4.gradle](../uml2esTransform/uml2es4dhf4.gradle). Copy into employeeHub/data/papyrus the UML2ES profile [../umlProfile/eclipse/MLProfileProject](../umlProfile/eclipse/MLProfileProject). You did it right if you can see the file employeeHub/data/papyrus/MLProfileProject/MLProfile.profile.uml. If you don't see the file in exactly that location, remove what you copied and try again at the correct level. @@ -60,7 +60,7 @@ When you are done, you should have the following folder structure: Now let's initialize the hub. In a command prompt navigate to your employeeHub folder and run the following: -gradle -i hubInit +./gradlew -i hubInit This creates a few additional subfolders: plugins, src/main/hub-internal-config, src/main/ml-config, src/main/ml-schemas, build, gradle, and .gradle. @@ -68,7 +68,7 @@ If you wish, add the contents of the employeeHub folder to your source code repo Finally, let's create an instance of the data hub. In the command prompt, run the following -gradle -i mlDeploy +./gradlew -i mlDeploy When this has completed, you should see in your MarkLogic environment several new databases, including xmi2es-tutorials-empHub-STAGING, xmi2es-tutorials-empHub-FINAL, and xmi2es-tutorials-empHub-MODULES. Check in admin console you have these. @@ -335,22 +335,10 @@ First, the build person modifies the build.gradle and gradle.properties files cr - To build.gradle, add the following code at the end: ``` -task prepHRModel(type: Copy) { - from "data/papyrus/EmployeeHubModel/EmployeeHubModel.uml" - into "data/model" - rename '(.*).uml', '$1.xml' -} - -task runUML2ESDeploy(type: GradleBuild) { +task deployHRModel(type: GradleBuild) { buildFile = "uml2es4dhf.gradle" tasks = ["uDeployModel"] } - -task deployHRModel() { - dependsOn "prepHRModel" - dependsOn "runUML2ESDeploy" - tasks.findByName('runUML2ESDeploy').mustRunAfter 'prepHRModel' -} ``` - To gradle.properties, add the following line at the end: diff --git a/uml2es/tutorials/gradle/build.gradle b/uml2es/tutorials/gradle/build.gradle index 98e9994..02abcb2 100644 --- a/uml2es/tutorials/gradle/build.gradle +++ b/uml2es/tutorials/gradle/build.gradle @@ -1,12 +1,12 @@ buildscript { repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} mavenLocal() - maven { url "http://plugins.gradle.org/m2" } + maven { url "https://plugins.gradle.org/m2" } } dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" + classpath "com.marklogic:ml-gradle:4.0.1" classpath "net.saliman:gradle-properties-plugin:1.4.6" } } @@ -15,14 +15,14 @@ apply plugin: "net.saliman.properties" apply plugin: "com.marklogic.ml-gradle" repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } + maven { url "https://plugins.gradle.org/m2" } + maven { url "https://developer.marklogic.com/maven2/" } // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } + maven { url "https://repository.cloudera.com/artifactory/cloudera-repos/" } } configurations { @@ -37,11 +37,12 @@ configurations { } dependencies { - mlcp "com.marklogic:mlcp:9.0.6" + mlcp "com.marklogic:mlcp:9.0.10" mlcp "org.apache.commons:commons-csv:1.2" mlcp files("lib") } + task includeXMI2ESTransform(type: Copy) { from "../../uml2esTransform/src/main/ml-modules/root/xmi2es" into "src/main/ml-modules/root/xmi2es" diff --git a/uml2es/tutorials/gradle/gradle/wrapper/gradle-wrapper.jar b/uml2es/tutorials/gradle/gradle/wrapper/gradle-wrapper.jar new file mode 100755 index 0000000..87b738c Binary files /dev/null and b/uml2es/tutorials/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/uml2es/tutorials/gradle/gradle/wrapper/gradle-wrapper.properties b/uml2es/tutorials/gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100755 index 0000000..44e7c4d --- /dev/null +++ b/uml2es/tutorials/gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/uml2es/tutorials/gradle/gradlew b/uml2es/tutorials/gradle/gradlew new file mode 100755 index 0000000..4453cce --- /dev/null +++ b/uml2es/tutorials/gradle/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/uml2es/tutorials/gradle/gradlew.bat b/uml2es/tutorials/gradle/gradlew.bat new file mode 100755 index 0000000..e95643d --- /dev/null +++ b/uml2es/tutorials/gradle/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/uml2es/tutorials/images/dmui_overall.png b/uml2es/tutorials/images/dmui_overall.png index 46fa24a..733468c 100644 Binary files a/uml2es/tutorials/images/dmui_overall.png and b/uml2es/tutorials/images/dmui_overall.png differ diff --git a/uml2es/tutorials/images/dmui_setup1.png b/uml2es/tutorials/images/dmui_setup1.png index ac17dbb..a5fa6d4 100644 Binary files a/uml2es/tutorials/images/dmui_setup1.png and b/uml2es/tutorials/images/dmui_setup1.png differ diff --git a/uml2es/tutorials/images/dmui_setup100.png b/uml2es/tutorials/images/dmui_setup100.png new file mode 100644 index 0000000..74e3b3d Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup100.png differ diff --git a/uml2es/tutorials/images/dmui_setup101.png b/uml2es/tutorials/images/dmui_setup101.png new file mode 100644 index 0000000..e032f78 Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup101.png differ diff --git a/uml2es/tutorials/images/dmui_setup102.png b/uml2es/tutorials/images/dmui_setup102.png new file mode 100644 index 0000000..f3aef54 Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup102.png differ diff --git a/uml2es/tutorials/images/dmui_setup103.png b/uml2es/tutorials/images/dmui_setup103.png new file mode 100644 index 0000000..de37a06 Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup103.png differ diff --git a/uml2es/tutorials/images/dmui_setup104.png b/uml2es/tutorials/images/dmui_setup104.png new file mode 100644 index 0000000..c8313cd Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup104.png differ diff --git a/uml2es/tutorials/images/dmui_setup105.png b/uml2es/tutorials/images/dmui_setup105.png new file mode 100644 index 0000000..e3d384e Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup105.png differ diff --git a/uml2es/tutorials/images/dmui_setup106.png b/uml2es/tutorials/images/dmui_setup106.png new file mode 100644 index 0000000..77b5a2b Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup106.png differ diff --git a/uml2es/tutorials/images/dmui_setup17a.png b/uml2es/tutorials/images/dmui_setup17a.png new file mode 100644 index 0000000..72f9d24 Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup17a.png differ diff --git a/uml2es/tutorials/images/dmui_setup18.png b/uml2es/tutorials/images/dmui_setup18.png index 9263424..61a7773 100644 Binary files a/uml2es/tutorials/images/dmui_setup18.png and b/uml2es/tutorials/images/dmui_setup18.png differ diff --git a/uml2es/tutorials/images/dmui_setup5.png b/uml2es/tutorials/images/dmui_setup5.png new file mode 100644 index 0000000..a7bb197 Binary files /dev/null and b/uml2es/tutorials/images/dmui_setup5.png differ diff --git a/uml2es/tutorials/magicdraw_model_edit.md b/uml2es/tutorials/magicdraw_model_edit.md index d228920..80b6711 100644 --- a/uml2es/tutorials/magicdraw_model_edit.md +++ b/uml2es/tutorials/magicdraw_model_edit.md @@ -118,9 +118,8 @@ The UML-to-Entity Services toolkit will transform your MagicDraw UML model into You now follow the same approach as the numerous [examples](../examples) of this toolkit. You use a gradle project to ingest your model to MarkLogic and convert it to Entity Services. For this tutorial, use the gradle project in [uml2es/tutorials/gradle](gradle) directory of your local clone. You first need to setup a database and deploy the transform. - The first step is to review and modify gradle.properties; set suitable values for hostname, ports, username/password, and application name. -- Next copy your MagicDraw model that you saved in XML form above to the gradle/data/model directory. -- Setup your database and deploy the transform by running: gradle -i setup mlDeploy -- Load your model by running gradle -b uml2es.gradle -i -PmodelName=MyMLModel uDeployModel +- Setup your database and deploy the transform by running: ./gradlew -i setup mlDeploy +- Load your model by running ./gradlew -b uml2es.gradle -i -PmodelFile=full-path-to-your-umlproject/MyMLModel.xml uDeployModel - In QueryConsole explore the database xmi2es-tutorial-content. Your Entity Services descriptor is /xmi2es/es/MyMLModel.json (or /marklogic.com/entity-services/models/MyMLModel.json). Notice how it aligns with the MagicDraw model: ![Project in MagicDraw - ES model](images/md_project_es.png) diff --git a/uml2es/tutorials/papyrus_model_edit.md b/uml2es/tutorials/papyrus_model_edit.md index 208f82a..e70c317 100644 --- a/uml2es/tutorials/papyrus_model_edit.md +++ b/uml2es/tutorials/papyrus_model_edit.md @@ -114,9 +114,8 @@ The UML-to-Entity Services toolkit will transform your Papyrus UML model into th You now follow the same approach as the numerous [examples](../examples) of this toolkit. You use a gradle project to ingest your model to MarkLogic and convert it to Entity Services. For this tutorial, use the gradle project in [uml2es/tutorials/gradle](gradle) directory of your local clone. You first need to setup a database and deploy the transform. - The first step is to review and modify gradle.properties; set suitable values for hostname, ports, username/password, and application name. -- Next copy your Papyrus model to the gradle/data/model directory. Papyrus saves the model in the file PapyrusPerson.uml in the MyPapyrusProject of your Eclipse workspace. Copy that file to the gradle/data/model directory. Rename the file PapyrusPerson.xml. -- Setup your database and deploy the transform by running: gradle -i setup mlDeploy -- Load your model by running gradle -b uml2es.gradle -i -PmodelName=PapyrusPerson uDeployModel +- Setup your database and deploy the transform by running: ./gradlew -i setup mlDeploy +- Load your model by running ./gradlew -b uml2es.gradle -i -PmodelFile=full-path-to-your-umlproject/PapyrusPerson.uml uDeployModel - In QueryConsole explore the database xmi2es-tutorial-content. Your Entity Services descriptor is /xmi2es/es/PapyrusPerson.json (or /marklogic.com/entity-services/models/PapyrusPerson.json). Notice how it aligns with the Papyrus model: ![Project in Papyrus - ES model](images/pap_model_es.png) diff --git a/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/cookieCutter.sjs b/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/cookieCutter.sjs index f1a8fae..59ca658 100644 --- a/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/cookieCutter.sjs +++ b/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/cookieCutter.sjs @@ -7,7 +7,7 @@ const discovery = require("/xmi2es/discovery.sjs"); const ALLOWABLE_PLUGINS = ["xqy", "sjs"]; const ALLOWABLE_FORMATS = ["xml", "json"]; -const ALLOWABLE_SELECTS = ["all", "infer"]; +const ALLOWABLE_SELECTS = ["all", "infer", "stereotype"]; const ALLOWABLE_CONTENTS = ["es", "dm"]; function getAttributes(modelIRI, entityName) { @@ -145,10 +145,25 @@ select distinct ?pluginName where { } function useAllEntities(modelIRI) { + +xdmp.log("useAllEntitites *" + modelIRI + "*"); + var res = sem.sparql(` select distinct ?pluginName where { <${modelIRI}> ?plugin . - $plugin ?pluginName + ?plugin ?pluginName + }`); + var plugins = []; + for (var p of res) plugins.push(p.pluginName); + return plugins; +} + +function stereotypedEntities(modelIRI) { + var res = sem.sparql(` +select distinct ?pluginName where { + <${modelIRI}> ?plugin . + ?plugin true . + ?plugin ?pluginName . }`); var plugins = []; for (var p of res) plugins.push(p.pluginName); @@ -415,6 +430,8 @@ function writeFile(folder, name, content, asText, model, coll, stagingDB) { contentNode = textNode.toNode(); } var uri = folder + name; + +xdmp.log("WRITING FILE " + uri); var collections = [coll, "cookieCutter"]; //, "http://marklogic.com/entity-services/models"]; if (model && model != "") collections.push(model); if (stagingDB && stagingDB != "") { @@ -858,12 +875,17 @@ function validateRequired(p, desc) { return p; } -function createEntities(modelName, entitySelect, entityNames, stagingDB) { +function createEntities(modelName, entitySelect, entityNames, stagingDB, options) { + + +xdmp.log("createEntities *" + modelName + "*"); // validate if (entitySelect != null && ALLOWABLE_SELECTS.indexOf(entitySelect) < 0) throw "Illegal entity select *" + entitySelect + "*"; modelName = validateRequired(modelName, "modelName"); + var is5 = options && options.dhf5; + // find the model var doc = cts.doc("/xmi2es/es/" + modelName + ".json"); if (!doc || doc == null) throw "Model not found *" + modelName + "*"; @@ -872,39 +894,36 @@ function createEntities(modelName, entitySelect, entityNames, stagingDB) { var modelIRI = info.baseUri + "/" + info.title + "-" + info.version; var modelIRIHash = info.baseUri + "#" + info.title + "-" + info.version; // cuz ES uses model IRI in a weird way - // which entities? - var allEntities = useAllEntities(modelIRIHash); var entities; if (entityNames && entityNames != null) entities = entityNames.split(",").map(function (e) { e = e.trim(); if (allEntities.indexOf(e) < 0) throw "Unknown entity *" + e + "*"; return e; }); - else if (entitySelect == "infer") entities = inferPlugins(modelIRIHash); - else if (entitySelect == "all") entities = allEntities; + else if (entitySelect == "stereotype") entities = stereotypedEntities(modelIRI).concat(stereotypedEntities(modelIRIHash)); + else if (entitySelect == "infer") entities = inferPlugins(modelIRI).concat(inferPlugins(modelIRIHash)); + else if (entitySelect == "all") entities = useAllEntities(modelIRI).concat(useAllEntities(modelIRIHash)); else throw "Should not have gotten here *" + entitySelect + "*"; if (entities.length == 0) throw "No entities specified or inferred"; +xdmp.log("ENTITIES *" + modelIRI + "*" + modelIRIHash + "*" + JSON.stringify(entities) + " " + is5); + // for DHF's benefit, do the big split // this means each entity in the model gets to be its own ES model // and the title of that model is the name of the entity // This is only for DHF's benefit; our cookie cutter only needs to see the REAL model. - for (var i = 0; i < allEntities.length; i++) { - var defName = allEntities[i]; + for (var i = 0; i < entities.length; i++) { + var defName = entities[i]; var loneDef = { info: JSON.parse(JSON.stringify(odoc.info)), - definitions: {} + definitions: odoc.definitions }; loneDef.info.title = defName; - loneDef.info.baseUri = "http://nooneieverheardof.com/es/"; // it needs its own URI to avoid triple explosion. - loneDef.definitions[defName] = odoc.definitions[defName]; + if (is5 == false) loneDef.info.baseUri = "http://nooneieverheardof.com/es/"; // it needs its own URI to avoid triple explosion. - writeFile("/entities/", defName + ".entity.json", loneDef, false, "", "loneDef", stagingDB); - - if (entities.indexOf(defName) >= 0) { - var folder = "/cookieCutter/" + modelName + "/plugins/entities/" + defName + "/"; - writeFile(folder, defName + ".entity.json", loneDef, false, modelName, "plugins"); - } + var folder = is5 == true ? "/cookieCutter/" + modelName + "/entities/" : + "/cookieCutter/" + modelName + "/plugins/entities/" + defName + "/"; + writeFile(folder, defName + ".entity.json", loneDef, false, modelName, "plugins"); } } diff --git a/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/extender.xqy b/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/extender.xqy index 803e500..43da3eb 100644 --- a/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/extender.xqy +++ b/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/extender.xqy @@ -27,6 +27,7 @@ declare variable $PRED-BASED-ON-ATTRIBUTE := sem:iri($IRI-PREFIX || "basedOnAttr declare variable $PRED-REMINDER := sem:iri($IRI-PREFIX || "reminder"); +declare variable $PRED-DHF := sem:iri($IRI-PREFIX || "dhfEntity"); declare variable $PRED-COLLECTIONS := sem:iri($IRI-PREFIX || "collections"); declare variable $PRED-PERM := sem:iri($IRI-PREFIX || "perm"); declare variable $PRED-CAPABILITY := sem:iri($IRI-PREFIX || "capability"); @@ -240,6 +241,7 @@ declare function xes:resolveBaseURI($xes, $baseURI as xs:string?) as xs:string { if (xes:emptyString($baseURI)) then let $_ := pt:addProblem($problems, (), (), $pt:MODEL-BASE-URI-NOT-FOUND, ()) return $DEFAULT-NAMESPACE + else if (fn:ends-with($baseURI, "/")) then fn:substring($baseURI, 1, fn:string-length($baseURI) - 1) else $baseURI }; diff --git a/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/xmi2esTransform.xqy b/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/xmi2esTransform.xqy index 1459002..cf6bb43 100644 --- a/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/xmi2esTransform.xqy +++ b/uml2es/uml2esTransform/src/main/ml-modules/root/xmi2es/xmi2esTransform.xqy @@ -64,7 +64,7 @@ declare function xmi2es:transform( ) as map:map* { let $xmiURI := map:get($content, "uri") let $xmi := map:get($content, "value") - let $docName := substring-before(substring-after($xmiURI,"/xmi2es/xmi/"), ".xml") + let $docName := substring-before(substring-after($xmiURI,"/xmi2es/xmi/"), ".") (: .xml, .uml :) let $param := map:get($context, "transform_param") let $transformResult := xmi2es:xmi2es($xmi, $param) let $esModel := map:get($transformResult, "descriptor") @@ -195,6 +195,7 @@ declare function xmi2es:buildClass($xmi as node(), $modelIRI as sem:iri, let $xmlNamespace := ($xmi/*/*:xmlNamespace[@base_Class eq $classID], $rootNamespace)[1] let $hints := $xmi/*/*:xImplHints[@base_Class eq $classID] let $exclude := exists($xmi/*/*:exclude[@base_Class eq $classID]) + let $dhfEntity := exists($xmi/*/*:xDHFEntity[@base_Class eq $classID]) let $inheritance := xmi2es:determineInheritance($xmi, $xes, $problems, $modelIRI, $class, $classes, ()) let $_ := if (count($class/generalization) gt 1) then @@ -219,6 +220,7 @@ declare function xmi2es:buildClass($xmi as node(), $modelIRI as sem:iri, xes:addFact($xes, $classIRI, sem:iri("http://marklogic.com/entity-services#title"), (), $className) ) else (), + xes:addFact($xes, $classIRI, $xes:PRED-DHF,(), $dhfEntity), for $coll in $inheritance/xDocument/collections/item return xes:addFact($xes, $classIRI, $xes:PRED-COLLECTIONS, (), string($coll)), for $perm in $inheritance/xDocument/permsCR/item return xes:addQualifiedFact($xes, $classIRI, $xes:PRED-PERM, (), map:new(( @@ -256,6 +258,7 @@ declare function xmi2es:buildClass($xmi as node(), $modelIRI as sem:iri, {$associationClass} {$exclude} {$classDescription} + {$dhfEntity} { if (exists($xmlNamespace)) then ( attribute {"prefix"} {normalize-space($xmlNamespace/@prefix)}, @@ -511,7 +514,7 @@ Capture ES validation of descriptor. Return empty sequence if valid. :) declare function xmi2es:isEsValid($descriptor as json:object) { try { - let $validatedDescriptor := es:model-validate($descriptor) + let $validatedDescriptor := es:model-validate(xdmp:unquote(xdmp:quote($descriptor))) return () } catch($exception) { diff --git a/uml2es/uml2esTransform/uml2es.gradle b/uml2es/uml2esTransform/uml2es.gradle index 14d77b2..c8a1fea 100644 --- a/uml2es/uml2esTransform/uml2es.gradle +++ b/uml2es/uml2esTransform/uml2es.gradle @@ -15,12 +15,12 @@ buildscript { repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} mavenLocal() - maven { url "http://plugins.gradle.org/m2" } + maven { url "https://plugins.gradle.org/m2" } } dependencies { - classpath "com.marklogic:ml-gradle:3.4.0" + classpath "com.marklogic:ml-gradle:4.0.1" classpath "net.saliman:gradle-properties-plugin:1.4.6" } } @@ -29,14 +29,14 @@ apply plugin: "net.saliman.properties" apply plugin: "com.marklogic.ml-gradle" repositories { - jcenter{url "http://jcenter.bintray.com/"} + jcenter{url "https://jcenter.bintray.com/"} // Needed for mlcp dependencies - maven { url "http://plugins.gradle.org/m2" } - maven { url "http://developer.marklogic.com/maven2/" } + maven { url "https://plugins.gradle.org/m2" } + maven { url "https://developer.marklogic.com/maven2/" } // Needed for hadoop dependencies for mlcp - maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } + maven { url "https://repository.cloudera.com/artifactory/cloudera-repos/" } } configurations { @@ -51,18 +51,16 @@ configurations { } dependencies { - mlcp "com.marklogic:mlcp:9.0.6" + mlcp "com.marklogic:mlcp:9.0.10" mlcp "org.apache.commons:commons-csv:1.2" mlcp files("lib") } + /* * PRIVATE TASKS: Model deployment */ task _mLoadXMI(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/model" - def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") if (myHost == null) myHost = project.findProperty("mlAppServicesHost") @@ -70,15 +68,16 @@ task _mLoadXMI(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def tparam = "dummy" + def tparam = 'dummy' if (project.findProperty("lax") != null && project.findProperty("lax") == "true") tparam = '{"lax": "true"}' - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".xml" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() - enabled = fullModelName != null && files != null && files.contains(fullModelName) + def xfile = null; + if (project.findProperty("modelFile") != null && !project.findProperty("modelFile").endsWith(".xlsx")) xfile = project.file(project.findProperty("modelFile")) + enabled = xfile != null && xfile.exists() + + def unixDir = xfile == null ? null : xfile.getCanonicalFile().getParent().replace('\\', '/') + def fullModelName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' classpath = configurations.mlcp command = "IMPORT" @@ -98,9 +97,6 @@ task _mLoadXMI(type: com.marklogic.gradle.task.MlcpTask) { } task _mLoadExcel(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/model-excel" - def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") if (myHost == null) myHost = project.findProperty("mlAppServicesHost") @@ -108,15 +104,15 @@ task _mLoadExcel(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def tparam = "dummy" + def tparam = 'dummy' if (project.findProperty("lax") != null && project.findProperty("lax") == "true") tparam = '{"lax": "true"}' - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".xlsx" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() - enabled = fullModelName != null && files != null && files.contains(fullModelName) + def xfile = null; + if (project.findProperty("modelFile") != null && project.findProperty("modelFile").endsWith(".xlsx")) xfile = project.file(project.findProperty("modelFile")) + enabled = xfile != null && xfile.exists() + def unixDir = xfile == null ? null : xfile.getCanonicalFile().getParent().replace('\\', '/') + def fullModelName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' classpath = configurations.mlcp command = "IMPORT" @@ -151,28 +147,23 @@ task _mFetchDescriptors(type: com.marklogic.gradle.task.MlcpTask) { port = myPort.toInteger() } -task _mCopyES(type: Copy) { - from "data/entity-services-dump/xmi2es/es" - into "data/entity-services" -} - -task _mCopyESExt(type: Copy) { - from "data/entity-services-dump/xmi2es/extension" - into "data/entity-services-extension" -} - task _mCopyGenCode(type: Copy) { from "data/entity-services-dump/xmi2es/gen" into "src/main/ml-modules/root/modelgen" } task _mDeleteES(type: Delete) { - delete "data/entity-services-dump", "data/entity-services-extension" + delete "data/entity-services-dump" +} + +task _mCopyES(type: Copy) { + from "data/entity-services-dump/xmi2es/es" + into "data/entity-services" } task _mLoadExtendedModel(type: com.marklogic.gradle.task.MlcpTask) { def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/entity-services-extension" + def unixDir = srcDir.replace('\\', '/') + "/data/entity-services-dump/xmi2es/extension" def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") @@ -181,24 +172,32 @@ task _mLoadExtendedModel(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".ttl" - enabled = fullModelName != null + def graphName = null; + if (project.findProperty("modelName") != null) graphName = project.findProperty("modelName") + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + graphName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = graphName != null classpath = configurations.mlcp command = "IMPORT" host = myHost port = myPort.toInteger() - input_file_path = unixDir + "/" + fullModelName + input_file_path = unixDir + "/" + graphName + ".ttl" input_file_type = "rdf" output_uri_prefix = "/triplestore" - output_graph = project.findProperty("modelName") + output_graph = graphName } task _mRemoveOldExtendedModel(type: com.marklogic.gradle.task.ServerEvalTask) { - def graphName = project.findProperty("modelName") + def graphName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + graphName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } enabled = graphName != null def js = "'use strict';\n" @@ -208,44 +207,25 @@ js += 'sem.graphDelete(sem.iri("' + graphName + '"));\n' javascript = js; } -/* -This ensures ES model is deployed to FINAL, not STAGING -*/ -task _mDeployESModelToFinal(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/entity-services" - def regex = '"' + unixDir + ",'',/,''" + '"' - - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".json" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() +task _mDeployFullModel(type: com.marklogic.gradle.task.ServerEvalTask) { - def myHost = project.findProperty("mlHost") - if (myHost == null) myHost = "" - def myPort = project.findProperty("mlFinalPort") - if (myPort == null) myPort = "0" - - enabled = fullModelName != null && files != null && files.contains(fullModelName) && project.findProperty("mlFinalPort") != null + def actualModelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + actualModelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = actualModelName != null - classpath = configurations.mlcp - command = "IMPORT" - document_type = "json" - input_file_path = unixDir + "/" + fullModelName - input_file_type = "documents" - output_uri_replace = regex - output_uri_prefix = "/marklogic.com/entity-services/models/" - output_permissions = "rest-reader,read,rest-writer,update" - output_collections = "http://marklogic.com/entity-services/models" - host = myHost - port = myPort.toInteger() +def js = "'use strict';\n" +js += 'declareUpdate();\n' +js += 'xdmp.documentInsert("/xmi2es/es/deployed/' + actualModelName + '.json",\n' +js += ' cts.doc("/xmi2es/es/' + actualModelName + '.json"),\n' +js += ' {collections: ["http://marklogic.com/entity-services/models"]})' + javascript = js; } + task _mLoadMappingSpec(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/mapping" - def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") if (myHost == null) myHost = project.findProperty("mlAppServicesHost") @@ -253,12 +233,12 @@ task _mLoadMappingSpec(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def fullSpecName = null; - if (project.findProperty("specName") != null) fullSpecName = project.findProperty("specName") + ".xlsx" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() - enabled = fullSpecName != null && files != null && files.contains(fullSpecName) + def xfile = null; + if (project.findProperty("specFile") != null && project.findProperty("specFile").endsWith(".xlsx")) xfile = new File(project.findProperty("specFile")) + enabled = xfile != null && xfile.exists() + def unixDir = xfile == null ? null : xfile.getParent().replace('\\', '/') + def fullSpecName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' classpath = configurations.mlcp command = "IMPORT" @@ -301,71 +281,15 @@ task _cDeleteCutDump(type: Delete) { delete "data/cookieCutter-dump" } -task _cCutEntities(type: com.marklogic.gradle.task.ServerEvalTask) { - def modelName = project.findProperty("modelName") - if (modelName != null) modelName = '"' + modelName + '"' - def entities = project.findProperty("entities") - if (entities != null) entities = '"' + entities + '"' - def entitySelect = project.findProperty("entitySelect") - if (entitySelect != null) entitySelect = '"' + entitySelect + '"' - def stg = '"' + project.findProperty("mlStagingDbName") + '"'; - -def js = "'use strict';\n" -js += 'const cookie = require("/xmi2es/cookieCutter.sjs");\n' -js += 'cookie.createEntities(' + modelName + ',' + entitySelect + ',' + entities + ',' + stg + ');\n' -println js - javascript = js; -} - -task _cFetchEntities(type: com.marklogic.gradle.task.MlcpTask) { - def directoryFilter = "/cookieCutter/" + project.findProperty("modelName") + "/plugins/entities/" - - def myHost = project.findProperty("mlHost") - if (myHost == null) myHost = "" - def myPort = project.findProperty("mlFinalPort") - if (myPort == null) myPort = "0" - - classpath = configurations.mlcp - command = "EXPORT" - output_file_path = "plugins" - output_file_path = "data/cookieCutter-dump" - directory_filter = directoryFilter - host = myHost - port = myPort.toInteger() -} - -task _cPromoteEntities(type: Copy) { - from "data/cookieCutter-dump/cookieCutter/" + project.findProperty("modelName") + "/plugins/entities" - into "plugins/entities" -} - -task _cCutHarmonizeFlow(type: com.marklogic.gradle.task.ServerEvalTask) { - def modelName = project.findProperty("modelName") - if (modelName != null) modelName = '"' + modelName + '"' - def entityName = project.findProperty("entityName") - if (entityName != null) entityName = '"' + entityName + '"' - def dataFormat = project.findProperty("dataFormat") - if (dataFormat != null) dataFormat = '"' + dataFormat + '"' - def pluginFormat = project.findProperty("pluginFormat") - if (pluginFormat != null) pluginFormat = '"' + pluginFormat + '"' - def flowName = project.findProperty("flowName") - if (flowName != null) flowName = '"' + flowName + '"' - def contentMode = project.findProperty("contentMode") - if (contentMode != null) contentMode = '"' + contentMode + '"' - def mappingSpec = project.findProperty("mappingSpec") - if (mappingSpec != null) mappingSpec = '"' + mappingSpec + '"' - def stg = '"' + project.findProperty("mlStagingDbName") + '"'; - -def js = "'use strict';\n" -js += 'const cookie = require("/xmi2es/cookieCutter.sjs");\n' -js += 'cookie.createHarmonizeFlow(' + modelName + ',' + entityName + ',' + dataFormat + ',' + pluginFormat + ',' + flowName + ',' + contentMode + ',' + mappingSpec + ',' + stg + ');\n' -println js - javascript = js; -} - task _cCutConversionModule(type: com.marklogic.gradle.task.ServerEvalTask) { - def modelName = project.findProperty("modelName") + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null if (modelName != null) modelName = '"' + modelName + '"' + def entityName = project.findProperty("entityName") if (entityName != null) entityName = '"' + entityName + '"' def dataFormat = project.findProperty("dataFormat") @@ -386,31 +310,6 @@ println js javascript = js; } -task _cFetchCutHarmonizeFlow(type: com.marklogic.gradle.task.MlcpTask) { - def directoryFilter = "/cookieCutter/" + project.findProperty("modelName") + "/plugins/entities/" + project.findProperty("entityName") + "/harmonize/" + project.findProperty("flowName") + "/" - directoryFilter += ",/dm/mapper/" + project.findProperty("modelName") + "/" - - def myHost = project.findProperty("mlHost") - if (myHost == null) myHost = "" - def myPort = project.findProperty("mlFinalPort") - if (myPort == null) myPort = "0" - - classpath = configurations.mlcp - command = "EXPORT" - output_file_path = "data/cookieCutter-dump" - directory_filter = directoryFilter - host = myHost - port = myPort.toInteger() -} - -task _cPromoteCutHarmonizeFlow(type: Copy) { - def harmPath = "plugins/entities/" + project.findProperty("entityName") + "/harmonize" - def flowPath = harmPath + "/" + project.findProperty("flowName") - enabled = project.findProperty("overwrite") == "true" || !file(flowPath).exists() - from "data/cookieCutter-dump/cookieCutter/" + project.findProperty("modelName") + "/" + flowPath - into flowPath -} - task _cFetchCutConversionModule(type: com.marklogic.gradle.task.MlcpTask) { def myHost = project.findProperty("mlHost") if (myHost == null) myHost = project.findProperty("mlAppServicesHost") @@ -418,7 +317,15 @@ task _cFetchCutConversionModule(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def directoryFilter = "/cookieCutter/" + project.findProperty("modelName") + "/src/main/ml-modules/root/esconversion/" + project.findProperty("modelName") + "/" + project.findProperty("entityName") + "/" + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null + if (modelName != null) modelName = '"' + modelName + '"' + + def directoryFilter = "/cookieCutter/" + modelName + "/src/main/ml-modules/root/esconversion/" +modelName + "/" + project.findProperty("entityName") + "/" classpath = configurations.mlcp command = "EXPORT" output_file_path = "data/cookieCutter-dump" @@ -428,10 +335,18 @@ task _cFetchCutConversionModule(type: com.marklogic.gradle.task.MlcpTask) { } task _cPromoteCutConversionModule(type: Copy) { - def convPath = "src/main/ml-modules/root/esconversion/" + project.findProperty("modelName") + "/" + project.findProperty("entityName") + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null + if (modelName != null) modelName = '"' + modelName + '"' + + def convPath = "src/main/ml-modules/root/esconversion/" + modelName + "/" + project.findProperty("entityName") println '!!!!' + convPath enabled = project.findProperty("overwrite") == "true" || !file(convPath).exists() - from "data/cookieCutter-dump/cookieCutter/" + project.findProperty("modelName") + "/" + convPath + from "data/cookieCutter-dump/cookieCutter/" + modelName + "/" + convPath into convPath } @@ -442,50 +357,43 @@ task _cPromoteCutConversionModule(type: Copy) { /* uDeployModel : deploys your UML (or even Excel) model as an ES model Input: -- modelName (XMI or Excel filename without suffix) +- modelFile (Full or relative path of your XMI or Excel file.) - lax: true/false. Default: false (Use lax mode when transforming from UML to ES.) Dependencies: -- Your gradle project has the folder data/model -- Your model is in that folder -- Your model is XMI -- Your model ends in .xml +- Your UML/XMI or Excel model file exists at the location specified by modelFile - Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... - Standard DHF environment properties: mlHost, mlFinalPort Effects: - Target database has the UML model, the ES model, the ES extensions, findings, generated code - Target database has the ES model and its extended triples deployed - Your gradle project has entity-services, entity-services-dump, entity-services-extension folders -- You will see generated code in src/main/ml-config, src/main/ml-modules, src/main/ml-schemas +- You will see generated code in src/main/ml-modules/root/modelgen */ task uDeployModel() { dependsOn '_mDeleteES' dependsOn '_mLoadXMI' dependsOn '_mLoadExcel' dependsOn '_mFetchDescriptors' - dependsOn '_mCopyES' - dependsOn '_mCopyESExt' dependsOn '_mCopyGenCode' + dependsOn '_mCopyES' // need this to place ES in a folder where we can run mlGen dependsOn '_mRemoveOldExtendedModel' dependsOn '_mLoadExtendedModel' - dependsOn 'mlGenerateModelArtifacts' - dependsOn '_mDeployESModelToFinal' + dependsOn '_mDeployFullModel' tasks.findByName('_mLoadXMI').mustRunAfter '_mDeleteES' tasks.findByName('_mLoadExcel').mustRunAfter '_mDeleteES' tasks.findByName('_mFetchDescriptors').mustRunAfter '_mLoadXMI' tasks.findByName('_mFetchDescriptors').mustRunAfter '_mLoadExcel' - tasks.findByName('_mCopyESExt').mustRunAfter '_mFetchDescriptors' - tasks.findByName('_mCopyES').mustRunAfter '_mFetchDescriptors' tasks.findByName('_mCopyGenCode').mustRunAfter '_mFetchDescriptors' - tasks.findByName('mlGenerateModelArtifacts').mustRunAfter '_mCopyES' - tasks.findByName('_mDeployESModelToFinal').mustRunAfter '_mCopyES' - tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mCopyESExt' + tasks.findByName('_mCopyES').mustRunAfter '_mFetchDescriptors' + tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mFetchDescriptors' tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mRemoveOldExtendedModel' + tasks.findByName('_mDeployFullModel').mustRunAfter '_mFetchDescriptors' } /* uLoadMappingSpec : loads your Excel mapping spec for use in cookie cutter codegen Input: -- specName = mandatory (Excel filename without suffix) +- specFile = mandatory (Excel filename without suffix) - discover = true/false; default false - discoveryDB = default: content DB (non-DHF), staging DB (DHF0) Dependencies: @@ -502,69 +410,10 @@ task uLoadMappingSpec() { tasks.findByName('_mDiscover').mustRunAfter '_mLoadMappingSpec' } - - -/* -uCreateDHFEntities - create DHF plugin entities; a souped-up hubCreateEntity -Input: -- modelName - name of UML module file without .xml suffix -- entities (optional) - CSV of class names representing entities to create -- entitySelect (optional) - Possible values: - "infer" - Have the cookie cutter infer which classes are entities. Ignore entities specified. - "all" - All classes are considered entities. Ignore entities specified. -Dependencies: -- Your gradle project is DHF 4.1 -- You have deployed your UML model -- Standard DHF environment properties: mlHost, mlFinalPort -Effects: -- New plugins created under plugins/entities folder -*/ -task uCreateDHFEntities() { - dependsOn '_cDeleteCutDump' - dependsOn '_cCutEntities' - dependsOn '_cFetchEntities' - dependsOn '_cPromoteEntities' - tasks.findByName('_cFetchEntities').mustRunAfter '_cCutEntities' - tasks.findByName('_cFetchEntities').mustRunAfter '_cDeleteCutDump' - tasks.findByName('_cPromoteEntities').mustRunAfter '_cFetchEntities' -} - -/* -uCreateDHFHarmonizeFlow - creates a harmonize flow for the specified entity. A souped-up hubCreateHarmonizeFlow -Input: -- modelName - name of UML module file without .xml suffix -- entityName - name of the entity. You must already have created this using uCreateDHFEntities -- dataFormat: xml, json -- pluginFormat: xqy, sjs -- flowName: the harmonization flow name -- contentMode: possible values - es - Entity Services mode. The cookie cutter generates ES-conversion style code and - incorporates hints from the data model and the mapping spec. This is like a souped up -useES option. - dm - Declarative Mapper mode. This feature is not ready yet. -- mappingSpec: previously uploaded Excel mapping spec; refer to it by the Excel URI -- overwrite: true/false. If true and harmonization already exists, overwrite it. If you don't want to clobber, set to false. -Dependencies: -- Your gradle project is DHF 4.1 -- You have deployed your UML model -- You have created the entity in question using uCreateDHFEntities -- Standard DHF environment properties: mlHost, mlFinalPort -Effects: -- New harmonization flow plugins/entities/entityName/harmonize folder -*/ -task uCreateDHFHarmonizeFlow() { - dependsOn '_cDeleteCutDump' - dependsOn '_cCutHarmonizeFlow' - dependsOn '_cFetchCutHarmonizeFlow' - dependsOn '_cPromoteCutHarmonizeFlow' - tasks.findByName('_cFetchCutHarmonizeFlow').mustRunAfter '_cCutHarmonizeFlow' - tasks.findByName('_cFetchCutHarmonizeFlow').mustRunAfter '_cDeleteCutDump' - tasks.findByName('_cPromoteCutHarmonizeFlow').mustRunAfter '_cFetchCutHarmonizeFlow' -} - /* uCreateConversionModule - creates a harmonize flow for the specified entity. A souped up es.instanceConverterGenerate. Input: -- modelName - name of UML module file without .xml suffix +- modelFile - name of UML module file without .xml suffix - entityName - name of the entity. - dataFormat: xml, json - pluginFormat: xqy, sjs @@ -572,13 +421,12 @@ Input: - contentMode: possible values es - Entity Services mode. The cookie cutter generates ES-conversion style code and incorporates hints from the data model and the mapping spec. This is like a souped up -useES option. - dm - Declarative Mapper mode. This feature is not ready yet. + dm - Declarative Mapper mode. THIS FEATURE IS DEPRECATED AND NOT SUPPORTED. - mappingSpec: previously uploaded Excel mapping spec; refer to it by the Excel URI - overwrite: true/false. If true and the module already exists, overwrite it. If you don't want to clobber, set to false. Dependencies: - You have deployed your UML model - Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... -- Standard DHF environment properties: mlHost, mlFinalPort. BUT WE RECOMMEND USING uCreateDHFHarmonizeFlow IF YOU ARE ON DHF. Effects: - New conversion module in src/main/ml-modules/root/modelName/entityName folder */ @@ -592,71 +440,4 @@ task uCreateConversionModule() { tasks.findByName('_cPromoteCutConversionModule').mustRunAfter '_cFetchCutConversionModule' } -/* -uLoadDMTemplate : Loads DM template into FINAL DB. You would have obtained the local copy from -uCreateDHFHarmonizationFlow or uCreateConversionModule with contentMode=dm. Having made your tweaks to that template, -you now ingest it back to MarkLogic. This task ensures the template has the right URI and collections. - -Example: - /dm/mapper/EmployeeHubModel/Employee/harmonizeGlobalDM.json - dm, cookieCutter, http://marklogic.com/entity-services/models, EmployeeHubModel - -Input: -- dmPath - mandatory -Dependencies: -- dmPth contains file dm/mapper///.json -- Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... -- Standard DHF environment properties: mlHost, mlFinalPort -Effects: -- Target database has your template -*/ -task uLoadDMTemplate(type: com.marklogic.gradle.task.MlcpTask) { - - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/" + project.findProperty("dmPath") - def regex = '"' + unixDir + ",''" + '"' - - def myHost = project.findProperty("mlHost") - if (myHost == null) myHost = project.findProperty("mlAppServicesHost") - def myPort = project.findProperty("mlAppServicesPort") - if (myPort == null) myPort = project.findProperty("mlRestPort") - if (myPort == null) myPort = project.findProperty("mlFinalPort") - - // check the pathness and extract the modelName - def pathDir = unixDir + "/dm/mapper" - def dmModelName = null - def pathFiles = file(pathDir).list() - if (pathFiles != null && pathFiles.size() == 1) { - dmModelName = pathFiles[0]; - } - enabled = project.findProperty("dmPath") != null && dmModelName != null - - def collections = "dm,cookieCutter,http://marklogic.com/entity-services/models," + dmModelName - - classpath = configurations.mlcp - command = "IMPORT" - document_type = "json" - input_file_path = unixDir + "/dm/mapper/*/*/*.json" - input_file_type = "documents" - output_uri_replace = regex - output_uri_prefix = "" - output_permissions = "rest-reader,read,rest-writer,update" - output_collections = collections - host = myHost - port = myPort.toInteger() -} - -//Edit this to enable/disable code generation of mlGenerateModelArtifacts -ext { - def mdb = project.findProperty("mlFinalDbName") - if (mdb == null) mdb = project.findProperty("mlAppName" + "-content") - mlAppConfig { - modelsDatabase=mdb - generateInstanceConverter=false - generateSchema=false - generateDatabaseProperties=false - generateExtractionTemplate=false - generateSearchOptions=false - } -} \ No newline at end of file diff --git a/uml2es/uml2esTransform/uml2es4dhf.gradle b/uml2es/uml2esTransform/uml2es4dhf4.gradle similarity index 65% rename from uml2es/uml2esTransform/uml2es4dhf.gradle rename to uml2es/uml2esTransform/uml2es4dhf4.gradle index d0cb5f6..dd351f9 100644 --- a/uml2es/uml2esTransform/uml2es4dhf.gradle +++ b/uml2es/uml2esTransform/uml2es4dhf4.gradle @@ -1,5 +1,5 @@ /* - Gradle tasks for UML2ES Toolkit. Use this in your project. + Gradle tasks for UML2ES Toolkit. Use this in your project if you are working in the old DHF 4.N version (starting with 4.1 or higher) You can either: - copy bits and pieces of it into your own gradle build file - use this as the basis for your gradle build file; build on it @@ -77,9 +77,6 @@ dependencies { */ task _mLoadXMI(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/model" - def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") if (myHost == null) myHost = project.findProperty("mlAppServicesHost") @@ -87,15 +84,15 @@ task _mLoadXMI(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def tparam = "dummy" + def tparam = 'dummy' if (project.findProperty("lax") != null && project.findProperty("lax") == "true") tparam = '{"lax": "true"}' - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".xml" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() - enabled = fullModelName != null && files != null && files.contains(fullModelName) + def xfile = null; + if (project.findProperty("modelFile") != null && !project.findProperty("modelFile").endsWith(".xlsx")) xfile = project.file(project.findProperty("modelFile")) + enabled = xfile != null && xfile.exists() + def unixDir = xfile == null ? null : xfile.getCanonicalFile().getParent().replace('\\', '/') + def fullModelName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' classpath = configurations.mlcp command = "IMPORT" @@ -115,9 +112,6 @@ task _mLoadXMI(type: com.marklogic.gradle.task.MlcpTask) { } task _mLoadExcel(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/model-excel" - def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") if (myHost == null) myHost = project.findProperty("mlAppServicesHost") @@ -125,15 +119,15 @@ task _mLoadExcel(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def tparam = "dummy" + def tparam = 'dummy' if (project.findProperty("lax") != null && project.findProperty("lax") == "true") tparam = '{"lax": "true"}' - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".xlsx" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() - enabled = fullModelName != null && files != null && files.contains(fullModelName) + def xfile = null; + if (project.findProperty("modelFile") != null && project.findProperty("modelFile").endsWith(".xlsx")) xfile = project.file(project.findProperty("modelFile")) + enabled = xfile != null && xfile.exists() + def unixDir = xfile == null ? null : xfile.getCanonicalFile().getParent().replace('\\', '/') + def fullModelName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' classpath = configurations.mlcp command = "IMPORT" @@ -168,28 +162,18 @@ task _mFetchDescriptors(type: com.marklogic.gradle.task.MlcpTask) { port = myPort.toInteger() } -task _mCopyES(type: Copy) { - from "data/entity-services-dump/xmi2es/es" - into "data/entity-services" -} - -task _mCopyESExt(type: Copy) { - from "data/entity-services-dump/xmi2es/extension" - into "data/entity-services-extension" -} - task _mCopyGenCode(type: Copy) { from "data/entity-services-dump/xmi2es/gen" into "src/main/ml-modules/root/modelgen" } task _mDeleteES(type: Delete) { - delete "data/entity-services-dump", "data/entity-services-extension" + delete "data/entity-services-dump" } task _mLoadExtendedModel(type: com.marklogic.gradle.task.MlcpTask) { def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/entity-services-extension" + def unixDir = srcDir.replace('\\', '/') + "/data/entity-services-dump/xmi2es/extension" def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") @@ -198,24 +182,31 @@ task _mLoadExtendedModel(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".ttl" - enabled = fullModelName != null + def graphName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + graphName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = graphName != null classpath = configurations.mlcp command = "IMPORT" host = myHost port = myPort.toInteger() - input_file_path = unixDir + "/" + fullModelName + input_file_path = unixDir + "/" + graphName + ".ttl" input_file_type = "rdf" output_uri_prefix = "/triplestore" - output_graph = project.findProperty("modelName") + output_graph = graphName } task _mRemoveOldExtendedModel(type: com.marklogic.gradle.task.ServerEvalTask) { - def graphName = project.findProperty("modelName") + def graphName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + graphName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } enabled = graphName != null def js = "'use strict';\n" @@ -225,44 +216,25 @@ js += 'sem.graphDelete(sem.iri("' + graphName + '"));\n' javascript = js; } -/* -This ensures ES model is deployed to FINAL, not STAGING -*/ -task _mDeployESModelToFinal(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/entity-services" - def regex = '"' + unixDir + ",'',/,''" + '"' +task _mDeployFullModel(type: com.marklogic.gradle.task.ServerEvalTask) { - def fullModelName = null; - if (project.findProperty("modelName") != null) fullModelName = project.findProperty("modelName") + ".json" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() - - def myHost = project.findProperty("mlHost") - if (myHost == null) myHost = "" - def myPort = project.findProperty("mlFinalPort") - if (myPort == null) myPort = "0" - - enabled = fullModelName != null && files != null && files.contains(fullModelName) && project.findProperty("mlFinalPort") != null + def actualModelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + actualModelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = actualModelName != null - classpath = configurations.mlcp - command = "IMPORT" - document_type = "json" - input_file_path = unixDir + "/" + fullModelName - input_file_type = "documents" - output_uri_replace = regex - output_uri_prefix = "/marklogic.com/entity-services/models/" - output_permissions = "rest-reader,read,rest-writer,update" - output_collections = "http://marklogic.com/entity-services/models" - host = myHost - port = myPort.toInteger() +def js = "'use strict';\n" +js += 'declareUpdate();\n' +js += 'xdmp.documentInsert("/xmi2es/es/deployed/' + actualModelName + '.json",\n' +js += ' cts.doc("/xmi2es/es/' + actualModelName + '.json"),\n' +js += ' {collections: ["http://marklogic.com/entity-services/models"]})' + javascript = js; } + task _mLoadMappingSpec(type: com.marklogic.gradle.task.MlcpTask) { - def srcDir = new File("${projectDir}").getAbsolutePath() - def unixDir = srcDir.replace('\\', '/') + "/data/mapping" - def regex = '"' + unixDir + ",'',/,''" + '"' def myHost = project.findProperty("mlHost") if (myHost == null) myHost = project.findProperty("mlAppServicesHost") @@ -270,12 +242,12 @@ task _mLoadMappingSpec(type: com.marklogic.gradle.task.MlcpTask) { if (myPort == null) myPort = project.findProperty("mlRestPort") if (myPort == null) myPort = project.findProperty("mlFinalPort") - def fullSpecName = null; - if (project.findProperty("specName") != null) fullSpecName = project.findProperty("specName") + ".xlsx" - def fdir = file(unixDir) - def files = null - if (fdir != null) files = fdir.list() - enabled = fullSpecName != null && files != null && files.contains(fullSpecName) + def xfile = null; + if (project.findProperty("specFile") != null && project.findProperty("specFile").endsWith(".xlsx")) xfile = new File(project.findProperty("specFile")) + enabled = xfile != null && xfile.exists() + def unixDir = xfile == null ? null : xfile.getCanonicalFile().getParent().replace('\\', '/') + def fullSpecName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' classpath = configurations.mlcp command = "IMPORT" @@ -296,7 +268,15 @@ task _mLoadMappingSpec(type: com.marklogic.gradle.task.MlcpTask) { task _mDiscover(type: com.marklogic.gradle.task.ServerEvalTask) { def discover = project.findProperty("discover") - def mappingURI = '"/xmi2es/excel-mapper/' + project.findProperty("specName") + '.xlsx"' + + def actualSpecName = null; + if (project.findProperty("specFile") != null) { + def fileNameProper = new File(project.findProperty("specFile")).getName() + actualSpecName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = actualSpecName != null + + def mappingURI = '"/xmi2es/excel-mapper/' + actualSpecName + '.xlsx"' def discoveryDB = "" if (project.findProperty("mlStagingDbName") != null) discoveryDB = '"' + project.findProperty("mlStagingDbName") + '"' else discoveryDB = '"' + project.findProperty("mlAppName") + "-content" @@ -319,8 +299,14 @@ task _cDeleteCutDump(type: Delete) { } task _cCutEntities(type: com.marklogic.gradle.task.ServerEvalTask) { - def modelName = project.findProperty("modelName") + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null if (modelName != null) modelName = '"' + modelName + '"' + def entities = project.findProperty("entities") if (entities != null) entities = '"' + entities + '"' def entitySelect = project.findProperty("entitySelect") @@ -335,7 +321,14 @@ println js } task _cFetchEntities(type: com.marklogic.gradle.task.MlcpTask) { - def directoryFilter = "/cookieCutter/" + project.findProperty("modelName") + "/plugins/entities/" + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null + + def directoryFilter = "/cookieCutter/" + modelName + "/plugins/entities/" def myHost = project.findProperty("mlHost") if (myHost == null) myHost = "" @@ -352,13 +345,26 @@ task _cFetchEntities(type: com.marklogic.gradle.task.MlcpTask) { } task _cPromoteEntities(type: Copy) { - from "data/cookieCutter-dump/cookieCutter/" + project.findProperty("modelName") + "/plugins/entities" + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null + + from "data/cookieCutter-dump/cookieCutter/" + modelName + "/plugins/entities" into "plugins/entities" } task _cCutHarmonizeFlow(type: com.marklogic.gradle.task.ServerEvalTask) { - def modelName = project.findProperty("modelName") - if (modelName != null) modelName = '"' + modelName + '"' + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null + modelName = '"' + modelName + '"' + def entityName = project.findProperty("entityName") if (entityName != null) entityName = '"' + entityName + '"' def dataFormat = project.findProperty("dataFormat") @@ -380,32 +386,17 @@ println js javascript = js; } -task _cCutConversionModule(type: com.marklogic.gradle.task.ServerEvalTask) { - def modelName = project.findProperty("modelName") - if (modelName != null) modelName = '"' + modelName + '"' - def entityName = project.findProperty("entityName") - if (entityName != null) entityName = '"' + entityName + '"' - def dataFormat = project.findProperty("dataFormat") - if (dataFormat != null) dataFormat = '"' + dataFormat + '"' - def pluginFormat = project.findProperty("pluginFormat") - if (pluginFormat != null) pluginFormat = '"' + pluginFormat + '"' - def moduleName = project.findProperty("moduleName") - if (moduleName != null) moduleName = '"' + moduleName + '"' - def contentMode = project.findProperty("contentMode") - if (contentMode != null) contentMode = '"' + contentMode + '"' - def mappingSpec = project.findProperty("mappingSpec") - if (mappingSpec != null) mappingSpec = '"' + mappingSpec + '"' - -def js = "'use strict';\n" -js += 'const cookie = require("/xmi2es/cookieCutter.sjs");\n' -js += 'cookie.createConversionModule(' + modelName + ',' + entityName + ',' + dataFormat + ',' + pluginFormat + ',' + moduleName + ',' + contentMode + ',' + mappingSpec + ');\n' -println js - javascript = js; -} task _cFetchCutHarmonizeFlow(type: com.marklogic.gradle.task.MlcpTask) { - def directoryFilter = "/cookieCutter/" + project.findProperty("modelName") + "/plugins/entities/" + project.findProperty("entityName") + "/harmonize/" + project.findProperty("flowName") + "/" - directoryFilter += ",/dm/mapper/" + project.findProperty("modelName") + "/" + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null + + def directoryFilter = "/cookieCutter/" + modelName + "/plugins/entities/" + project.findProperty("entityName") + "/harmonize/" + project.findProperty("flowName") + "/" + directoryFilter += ",/dm/mapper/" + modelName + "/" def myHost = project.findProperty("mlHost") if (myHost == null) myHost = "" @@ -421,36 +412,20 @@ task _cFetchCutHarmonizeFlow(type: com.marklogic.gradle.task.MlcpTask) { } task _cPromoteCutHarmonizeFlow(type: Copy) { + def modelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + modelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = modelName != null + def harmPath = "plugins/entities/" + project.findProperty("entityName") + "/harmonize" def flowPath = harmPath + "/" + project.findProperty("flowName") enabled = project.findProperty("overwrite") == "true" || !file(flowPath).exists() - from "data/cookieCutter-dump/cookieCutter/" + project.findProperty("modelName") + "/" + flowPath + from "data/cookieCutter-dump/cookieCutter/" + modelName + "/" + flowPath into flowPath } -task _cFetchCutConversionModule(type: com.marklogic.gradle.task.MlcpTask) { - def myHost = project.findProperty("mlHost") - if (myHost == null) myHost = project.findProperty("mlAppServicesHost") - def myPort = project.findProperty("mlAppServicesPort") - if (myPort == null) myPort = project.findProperty("mlRestPort") - if (myPort == null) myPort = project.findProperty("mlFinalPort") - - def directoryFilter = "/cookieCutter/" + project.findProperty("modelName") + "/src/main/ml-modules/root/esconversion/" + project.findProperty("modelName") + "/" + project.findProperty("entityName") + "/" - classpath = configurations.mlcp - command = "EXPORT" - output_file_path = "data/cookieCutter-dump" - directory_filter = directoryFilter - host = myHost - port = myPort.toInteger() -} - -task _cPromoteCutConversionModule(type: Copy) { - def convPath = "src/main/ml-modules/root/esconversion/" + project.findProperty("modelName") + "/" + project.findProperty("entityName") - println '!!!!' + convPath - enabled = project.findProperty("overwrite") == "true" || !file(convPath).exists() - from "data/cookieCutter-dump/cookieCutter/" + project.findProperty("modelName") + "/" + convPath - into convPath -} /* * PUBLIC TASKS @@ -459,50 +434,41 @@ task _cPromoteCutConversionModule(type: Copy) { /* uDeployModel : deploys your UML (or even Excel) model as an ES model Input: -- modelName (XMI or Excel filename without suffix) +- modelFile (Full or relative path of your XMI or Excel file.) - lax: true/false. Default: false (Use lax mode when transforming from UML to ES.) Dependencies: -- Your gradle project has the folder data/model -- Your model is in that folder -- Your model is XMI -- Your model ends in .xml +- Your UML/XMI or Excel model file exists at the location specified by modelFile - Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... - Standard DHF environment properties: mlHost, mlFinalPort Effects: - Target database has the UML model, the ES model, the ES extensions, findings, generated code - Target database has the ES model and its extended triples deployed - Your gradle project has entity-services, entity-services-dump, entity-services-extension folders -- You will see generated code in src/main/ml-config, src/main/ml-modules, src/main/ml-schemas +- You will see generated code in src/main/ml-modules/root/modelgen */ task uDeployModel() { dependsOn '_mDeleteES' dependsOn '_mLoadXMI' dependsOn '_mLoadExcel' dependsOn '_mFetchDescriptors' - dependsOn '_mCopyES' - dependsOn '_mCopyESExt' dependsOn '_mCopyGenCode' dependsOn '_mRemoveOldExtendedModel' dependsOn '_mLoadExtendedModel' - dependsOn 'mlGenerateModelArtifacts' - dependsOn '_mDeployESModelToFinal' + dependsOn '_mDeployFullModel' // I need it for cookie cutter tasks.findByName('_mLoadXMI').mustRunAfter '_mDeleteES' tasks.findByName('_mLoadExcel').mustRunAfter '_mDeleteES' tasks.findByName('_mFetchDescriptors').mustRunAfter '_mLoadXMI' tasks.findByName('_mFetchDescriptors').mustRunAfter '_mLoadExcel' - tasks.findByName('_mCopyESExt').mustRunAfter '_mFetchDescriptors' - tasks.findByName('_mCopyES').mustRunAfter '_mFetchDescriptors' tasks.findByName('_mCopyGenCode').mustRunAfter '_mFetchDescriptors' - tasks.findByName('mlGenerateModelArtifacts').mustRunAfter '_mCopyES' - tasks.findByName('_mDeployESModelToFinal').mustRunAfter '_mCopyES' - tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mCopyESExt' + tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mFetchDescriptors' tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mRemoveOldExtendedModel' + tasks.findByName('_mDeployFullModel').mustRunAfter '_mFetchDescriptors' } /* uLoadMappingSpec : loads your Excel mapping spec for use in cookie cutter codegen Input: -- specName = mandatory (Excel filename without suffix) +- specFile = mandatory (Excel filename without suffix) - discover = true/false; default false - discoveryDB = default: content DB (non-DHF), staging DB (DHF0) Dependencies: @@ -519,8 +485,6 @@ task uLoadMappingSpec() { tasks.findByName('_mDiscover').mustRunAfter '_mLoadMappingSpec' } - - /* uCreateDHFEntities - create DHF plugin entities; a souped-up hubCreateEntity Input: @@ -578,37 +542,6 @@ task uCreateDHFHarmonizeFlow() { tasks.findByName('_cPromoteCutHarmonizeFlow').mustRunAfter '_cFetchCutHarmonizeFlow' } -/* -uCreateConversionModule - creates a harmonize flow for the specified entity. A souped up es.instanceConverterGenerate. -Input: -- modelName - name of UML module file without .xml suffix -- entityName - name of the entity. -- dataFormat: xml, json -- pluginFormat: xqy, sjs -- moduleName the module name -- contentMode: possible values - es - Entity Services mode. The cookie cutter generates ES-conversion style code and - incorporates hints from the data model and the mapping spec. This is like a souped up -useES option. - dm - Declarative Mapper mode. This feature is not ready yet. -- mappingSpec: previously uploaded Excel mapping spec; refer to it by the Excel URI -- overwrite: true/false. If true and the module already exists, overwrite it. If you don't want to clobber, set to false. -Dependencies: -- You have deployed your UML model -- Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... -- Standard DHF environment properties: mlHost, mlFinalPort. BUT WE RECOMMEND USING uCreateDHFHarmonizeFlow IF YOU ARE ON DHF. -Effects: -- New conversion module in src/main/ml-modules/root/modelName/entityName folder -*/ -task uCreateConversionModule() { - dependsOn '_cDeleteCutDump' - dependsOn '_cCutConversionModule' - dependsOn '_cFetchCutConversionModule' - dependsOn '_cPromoteCutConversionModule' - tasks.findByName('_cFetchCutConversionModule').mustRunAfter '_cCutConversionModule' - tasks.findByName('_cFetchCutConversionModule').mustRunAfter '_cDeleteCutDump' - tasks.findByName('_cPromoteCutConversionModule').mustRunAfter '_cFetchCutConversionModule' -} - /* uLoadDMTemplate : Loads DM template into FINAL DB. You would have obtained the local copy from uCreateDHFHarmonizationFlow or uCreateConversionModule with contentMode=dm. Having made your tweaks to that template, @@ -664,16 +597,3 @@ task uLoadDMTemplate(type: com.marklogic.gradle.task.MlcpTask) { port = myPort.toInteger() } -//Edit this to enable/disable code generation of mlGenerateModelArtifacts -ext { - def mdb = project.findProperty("mlFinalDbName") - if (mdb == null) mdb = project.findProperty("mlAppName" + "-content") - mlAppConfig { - modelsDatabase=mdb - generateInstanceConverter=false - generateSchema=false - generateDatabaseProperties=false - generateExtractionTemplate=false - generateSearchOptions=false - } -} diff --git a/uml2es/uml2esTransform/uml2es4dhf5.gradle b/uml2es/uml2esTransform/uml2es4dhf5.gradle new file mode 100644 index 0000000..c308af6 --- /dev/null +++ b/uml2es/uml2esTransform/uml2es4dhf5.gradle @@ -0,0 +1,378 @@ +/* + Gradle tasks for UML2ES Toolkit. Use this in your project. + You can either: + - copy bits and pieces of it into your own gradle build file + - use this as the basis for your gradle build file; build on it + - keep it as is and call it to run just the UML2ES tasks using gradle's -b flag; + you will also have another gradle build file with the rest of your tasks + + Tasks that begin with "_" are private. Don't call them; they are called internally. + Tasks that begin with "u" are public. Call them! + + You have a TODO. You should plugin versions in this build script to match your environment + See the TODO edit comments +*/ + +plugins { + id 'java' + id 'eclipse' + id 'idea' + + // This plugin allows you to create different environments + // for your gradle deploy. Each environment is represented + // by a gradle-${env}.properties file + // See https://github.com/stevesaliman/gradle-properties-plugin + // specify the env on the command line with: + // gradle -PenvironmentName=x ... + id 'net.saliman.properties' version '1.4.6' + + // This gradle plugin extends the ml-gradle plugin with + // commands that make the Data Hub Framework do its magic + // You can change to any 4.x build. Must be 5.0 or higher. + id 'com.marklogic.ml-data-hub' version '5.1.0' /// TODO - EDIT +} + +repositories { + jcenter() + maven {url 'http://developer.marklogic.com/maven2/'} + + // Needed for mlcp dependencies + maven { url "http://plugins.gradle.org/m2" } + maven { url "http://developer.marklogic.com/maven2/" } + + // Needed for hadoop dependencies for mlcp + maven { url "http://repository.cloudera.com/artifactory/cloudera-repos/" } +} + +configurations { + + // This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want + // to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as + // shown below. Need to force to use certain version of xml-apis library. + mlcp { + resolutionStrategy { + force "xml-apis:xml-apis:1.4.01" + } + } +} + +dependencies { + // this allows you to write custom java code that depends + // on the Data Hub Framework library + // You can change to any 5.x build. + compile 'com.marklogic:marklogic-data-hub:5.1.0' // TODO - edit + compile 'com.marklogic:marklogic-xcc:9.0.10' // TODO - edit + + mlcp "com.marklogic:mlcp:9.0.10" // TODO - edit + mlcp "org.apache.commons:commons-csv:1.2" + mlcp files("lib") +} + +/* + * PRIVATE TASKS: Model deployment + */ + +task _mLoadXMI(type: com.marklogic.gradle.task.MlcpTask) { + + def myHost = project.findProperty("mlHost") + if (myHost == null) myHost = project.findProperty("mlAppServicesHost") + def myPort = project.findProperty("mlAppServicesPort") + if (myPort == null) myPort = project.findProperty("mlRestPort") + if (myPort == null) myPort = project.findProperty("mlFinalPort") + + def tparam = 'dummy' + if (project.findProperty("lax") != null && project.findProperty("lax") == "true") tparam = '{"lax": "true"}' + + def xfile = null; + if (project.findProperty("modelFile") != null && !project.findProperty("modelFile").endsWith(".xlsx")) xfile = project.file(project.findProperty("modelFile")) + enabled = xfile != null && xfile.exists() + def unixDir = xfile == null ? null : xfile.getCanonicalFile().getParent().replace('\\', '/') + def fullModelName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' + + classpath = configurations.mlcp + command = "IMPORT" + document_type = "xml" + input_file_path = unixDir + "/" + fullModelName + input_file_type = "documents" + output_uri_replace = regex + output_uri_prefix = "/xmi2es/xmi/" + output_permissions = "rest-reader,read,rest-writer,update" + output_collections = "xmi2es" + host = myHost + port = myPort.toInteger() + + transform_module = "/xmi2es/xmi2esTransform.xqy" + transform_namespace ="http://marklogic.com/xmi2es" + transform_param = tparam +} + +task _mLoadExcel(type: com.marklogic.gradle.task.MlcpTask) { + + def myHost = project.findProperty("mlHost") + if (myHost == null) myHost = project.findProperty("mlAppServicesHost") + def myPort = project.findProperty("mlAppServicesPort") + if (myPort == null) myPort = project.findProperty("mlRestPort") + if (myPort == null) myPort = project.findProperty("mlFinalPort") + + def tparam = 'dummy' + if (project.findProperty("lax") != null && project.findProperty("lax") == "true") tparam = '{"lax": "true"}' + + def xfile = null; + if (project.findProperty("modelFile") != null && project.findProperty("modelFile").endsWith(".xlsx")) xfile = project.file(project.findProperty("modelFile")) + enabled = xfile != null && xfile.exists() + def unixDir = xfile == null ? null : xfile.getCanonicalFile().getParent().replace('\\', '/') + def fullModelName = xfile == null ? null : xfile.getName() + def regex = xfile == null ? null : '"' + unixDir + ",'',/,''" + '"' + + classpath = configurations.mlcp + command = "IMPORT" + document_type = "binary" + input_file_path = unixDir + "/" + fullModelName + input_file_type = "documents" + output_uri_replace = regex + output_uri_prefix = "/xmi2es/excel/" + output_permissions = "rest-reader,read,rest-writer,update" + output_collections = "xmi2es" + host = myHost + port = myPort.toInteger() + + transform_module = "/xmi2es/excel2uml.xqy" + transform_namespace = "http://marklogic.com/xmi2es/xlsx" + transform_param = tparam +} + +task _mFetchDescriptors(type: com.marklogic.gradle.task.MlcpTask) { + + def myHost = project.findProperty("mlHost") + if (myHost == null) myHost = project.findProperty("mlAppServicesHost") + def myPort = project.findProperty("mlAppServicesPort") + if (myPort == null) myPort = project.findProperty("mlRestPort") + if (myPort == null) myPort = project.findProperty("mlFinalPort") + + classpath = configurations.mlcp + command = "EXPORT" + output_file_path = "data/entity-services-dump" + collection_filter = "xmi2es" + host = myHost + port = myPort.toInteger() +} + +task _mCopyGenCode(type: Copy) { + from "data/entity-services-dump/xmi2es/gen" + into "src/main/ml-modules/root/modelgen" +} + +task _mDeleteES(type: Delete) { + delete "data/entity-services-dump" +} + +task _mLoadExtendedModel(type: com.marklogic.gradle.task.MlcpTask) { + def srcDir = new File("${projectDir}").getAbsolutePath() + def unixDir = srcDir.replace('\\', '/') + "/data/entity-services-dump/xmi2es/extension" + def regex = '"' + unixDir + ",'',/,''" + '"' + + def myHost = project.findProperty("mlHost") + if (myHost == null) myHost = project.findProperty("mlAppServicesHost") + def myPort = project.findProperty("mlAppServicesPort") + if (myPort == null) myPort = project.findProperty("mlRestPort") + if (myPort == null) myPort = project.findProperty("mlFinalPort") + + def graphName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + graphName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = graphName != null + + classpath = configurations.mlcp + command = "IMPORT" + host = myHost + port = myPort.toInteger() + + input_file_path = unixDir + "/" + graphName + ".ttl" + input_file_type = "rdf" + output_uri_prefix = "/triplestore" + output_graph = graphName +} + +task _mRemoveOldExtendedModel(type: com.marklogic.gradle.task.ServerEvalTask) { + + def graphName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + graphName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = graphName != null + +def js = "'use strict';\n" +js += 'declareUpdate();' +js += 'const sem = require("/MarkLogic/semantics.xqy");\n' +js += 'sem.graphDelete(sem.iri("' + graphName + '"));\n' + javascript = js; +} + +task _mDeployFullModel(type: com.marklogic.gradle.task.ServerEvalTask) { + + def actualModelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + actualModelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = actualModelName != null + +def js = "'use strict';\n" +js += 'declareUpdate();\n' +js += 'xdmp.documentInsert("/xmi2es/es/deployed/' + actualModelName + '.json",\n' +js += ' cts.doc("/xmi2es/es/' + actualModelName + '.json"),\n' +js += ' {collections: ["http://marklogic.com/entity-services/models"]})' + javascript = js; +} + +/* + * PRIVATE TASKS: Cookie cutter + */ + +task _cDeleteCutDump(type: Delete) { + delete "data/cookieCutter-dump" +} + +task _cCutEntities(type: com.marklogic.gradle.task.ServerEvalTask) { + + def actualModelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + actualModelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = actualModelName != null + + + if (actualModelName != null) actualModelName = '"' + actualModelName + '"' + def entities = project.findProperty("entities") + if (entities != null) entities = '"' + entities + '"' + def entitySelect = project.findProperty("entitySelect") + if (entitySelect != null) entitySelect = '"' + entitySelect + '"' + def stg = '"' + project.findProperty("mlStagingDbName") + '"'; + +def js = "'use strict';\n" +js += 'const cookie = require("/xmi2es/cookieCutter.sjs");\n' +js += 'const options = {dhf5: 1};\n' +js += 'cookie.createEntities(' + actualModelName + ',' + entitySelect + ',' + entities + ',' + stg + ', options);\n' +println js + javascript = js; +} + +task _cFetchEntities(type: com.marklogic.gradle.task.MlcpTask) { + + def actualModelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + actualModelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = actualModelName != null + + def directoryFilter = "/cookieCutter/" + actualModelName + "/entities/" + + def myHost = project.findProperty("mlHost") + if (myHost == null) myHost = "" + def myPort = project.findProperty("mlFinalPort") + if (myPort == null) myPort = "0" + + classpath = configurations.mlcp + command = "EXPORT" + output_file_path = "plugins" + output_file_path = "data/cookieCutter-dump" + directory_filter = directoryFilter + host = myHost + port = myPort.toInteger() +} + +task _cPromoteEntities(type: Copy) { + + def actualModelName = null; + if (project.findProperty("modelFile") != null) { + def fileNameProper = new File(project.findProperty("modelFile")).getName() + actualModelName = fileNameProper.substring(0, fileNameProper.indexOf(".")) + } + enabled = actualModelName != null + + from "data/cookieCutter-dump/cookieCutter/" + actualModelName + "/entities" + into "entities" +} + + +/* + * PUBLIC TASKS + */ + +/* +uDeployModel : deploys your UML (or even Excel) model as an ES model +Input: +- modelFile (Full or relative path of your XMI or Excel file.) +- lax: true/false. Default: false (Use lax mode when transforming from UML to ES.) +Dependencies: +- Your UML/XMI or Excel model file exists at the location specified by modelFile +- Standard ml-gradle environment properties: mlAppServicesHost, mlAppServicesPort. OR ... +- Standard DHF environment properties: mlHost, mlFinalPort +Effects: +- FINAL database has the UML model, the ES model, the ES extensions, findings, generated code +- FINAL database has the ES model and its extended triples deployed +- Your gradle project has entity-services, entity-services-dump, entity-services-extension folders +- You will see generated code in src/main/ml-modules/root/modelgen +*/ +task uDeployModel() { + dependsOn '_mDeleteES' + dependsOn '_mLoadXMI' + dependsOn '_mLoadExcel' + dependsOn '_mFetchDescriptors' + dependsOn '_mCopyGenCode' + dependsOn '_mRemoveOldExtendedModel' + dependsOn '_mLoadExtendedModel' + dependsOn '_mDeployFullModel' // I need it for cookie cutter + tasks.findByName('_mLoadXMI').mustRunAfter '_mDeleteES' + tasks.findByName('_mLoadExcel').mustRunAfter '_mDeleteES' + tasks.findByName('_mFetchDescriptors').mustRunAfter '_mLoadXMI' + tasks.findByName('_mFetchDescriptors').mustRunAfter '_mLoadExcel' + tasks.findByName('_mCopyGenCode').mustRunAfter '_mFetchDescriptors' + tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mFetchDescriptors' + tasks.findByName('_mLoadExtendedModel').mustRunAfter '_mRemoveOldExtendedModel' + tasks.findByName('_mDeployFullModel').mustRunAfter '_mFetchDescriptors' +} + +/* +uCreateDHFEntities - create DHF-compatible entities from the ES model created in uDeployModel +Input: +- modelFile (See uDeployModel) +- entities (optional) - CSV of class names representing entities to create +- entitySelect (optional) - Possible values: + "infer" - Have the cookie cutter infer which classes are entities. Ignore entities specified. + "all" - All classes are considered entities. Ignore entities specified. + "stereotype" - Classes stereotyped as xDHFEntity are considered entities. +Dependencies: +- Your gradle project is DHF 5.x where x >= 1 +- You have deployed your UML model +- Standard DHF environment properties: mlHost, mlFinalPort +Effects: +- DHF-compatible entities entities folder +*/ +task uCreateDHFEntities() { + dependsOn '_cDeleteCutDump' + dependsOn '_cCutEntities' + dependsOn '_cFetchEntities' + dependsOn '_cPromoteEntities' + tasks.findByName('_cCutEntities').mustRunAfter '_mDeployFullModel' + tasks.findByName('_cFetchEntities').mustRunAfter '_cCutEntities' + tasks.findByName('_cFetchEntities').mustRunAfter '_cDeleteCutDump' + tasks.findByName('_cPromoteEntities').mustRunAfter '_cFetchEntities' +} + +// Combines uDeployModel and uCreateDHFEntities +task uDeployModelToDHF() { + dependsOn 'uDeployModel' + dependsOn 'uCreateDHFEntities' + tasks.findByName('uCreateDHFEntities').mustRunAfter 'uDeployModel' +} + +// TODO - task for semantic TDE generation.. + + diff --git a/uml2es/umlProfile/MLProfile.xml b/uml2es/umlProfile/MLProfile.xml index c1849e3..bbb9b4f 100644 --- a/uml2es/umlProfile/MLProfile.xml +++ b/uml2es/umlProfile/MLProfile.xml @@ -1,219 +1,225 @@ - - - -

+ + + +
- - - - - + + + + + - + - - - + + + - - - + + + - + - + - - - + + + - + - + - + - - - + + + - - - + + + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - + - - - + + + - + - + - + - + - - - + + + - + - + - + - + - - - + + + - - - + + + - + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -520,6 +526,17 @@ + + + + + + + + + + + diff --git a/uml2es/umlProfile/eclipse/MLProfileProject/MLProfile.profile.uml b/uml2es/umlProfile/eclipse/MLProfileProject/MLProfile.profile.uml index c1849e3..bbb9b4f 100644 --- a/uml2es/umlProfile/eclipse/MLProfileProject/MLProfile.profile.uml +++ b/uml2es/umlProfile/eclipse/MLProfileProject/MLProfile.profile.uml @@ -1,219 +1,225 @@ - - - -
+ + + +
- - - - - + + + + + - + - - - + + + - - - + + + - + - + - - - + + + - + - + - + - - - + + + - - - + + + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - + + + + + - - - + + + - + - - - + + + - + - + - + - + - - - + + + - + - + - + - + - - - + + + - - - + + + - + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - + - + - - - + + + - + - - - + + + - + - - - + + + - + @@ -520,6 +526,17 @@ + + + + + + + + + + + diff --git a/uml2es/umlProfile/magicdraw/MLProfile.xml b/uml2es/umlProfile/magicdraw/MLProfile.xml index 0cf3feb..34e51d0 100644 --- a/uml2es/umlProfile/magicdraw/MLProfile.xml +++ b/uml2es/umlProfile/magicdraw/MLProfile.xml @@ -1,6 +1,6 @@ - + @@ -21,31 +21,32 @@ - - - + + + + + + - - - - + + - + + + - + + + + + + - - - - - + - - - - + _18_5_2_8c5028b_1518562583960_84992_5215 _18_5_2_8c5028b_1529489360379_394068_5192 _18_5_2_8c5028b_1520185379843_965008_5160 @@ -57,17 +58,18 @@ _18_5_2_8c5028b_1506530971176_692582_5131 _18_5_2_8c5028b_1520084972378_328811_5248 _18_5_2_8c5028b_1520331958226_797849_5177 - _18_5_2_8c5028b_1506442679182_592561_4784 _18_5_2_8c5028b_1518533879331_259602_5090 + _18_5_2_8c5028b_1506442679182_592561_4784 _18_5_2_8c5028b_1541017131272_33574_5282 - _18_5_2_8c5028b_1506442601753_594892_4700 _18_5_2_8c5028b_1543317375919_912438_5308 + _18_5_2_8c5028b_1506442601753_594892_4700 _18_5_2_8c5028b_1518562175741_403495_5122 _18_5_2_8c5028b_1506442635965_588533_4728 _18_5_2_8c5028b_1506517160021_298066_5010 _18_5_2_8c5028b_1520101236705_739681_5317 _18_5_2_8c5028b_1541008064756_656631_5244 _18_5_2_8c5028b_1520185415749_537350_5187 + _18_5_2_8c5028b_1573086824722_263445_5308 @@ -718,6 +720,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -937,7 +961,7 @@ - + @@ -979,254 +1003,48 @@ - - _18_5_2_8c5028b_1543317375919_912438_5308 - _18_5_2_8c5028b_1520331958226_797849_5177 - _18_5_2_8c5028b_1520185359822_325005_5132 - _18_5_2_8c5028b_1520084972378_328811_5248 - _18_5_2_8c5028b_1518562175741_403495_5122 + + _18_5_2_8c5028b_1541008064756_656631_5244 + _18_5_2_8c5028b_1543317320845_806543_5296 _18_5_2_8c5028b_1520185379843_965008_5160 - _18_5_2_8c5028b_1520084770050_759611_5210 - _18_5_2_8c5028b_1506530971176_692582_5131 - _18_5_2_8c5028b_1520185415749_537350_5187 - _18_5_2_8c5028b_1541007983529_711547_5207 - _18_5_2_8c5028b_1506442601753_594892_4700 - _18_5_2_8c5028b_1541017131272_33574_5282 - _18_5_2_8c5028b_1506517160021_298066_5010 - _18_5_2_8c5028b_1518533879331_259602_5090 - _18_5_2_8c5028b_1520101236705_739681_5317 _18_5_2_8c5028b_1506442679182_592561_4784 - _18_5_2_8c5028b_1506442711620_81982_4814 - _18_5_2_8c5028b_1506442635965_588533_4728 - _18_5_2_8c5028b_1541008064756_656631_5244 _18_5_2_8c5028b_1518562583960_84992_5215 - _18_5_2_8c5028b_1543317320845_806543_5296 + _18_5_2_8c5028b_1506442711620_81982_4814 _18_5_2_8c5028b_1529489360379_394068_5192 + _18_5_2_8c5028b_1506442601753_594892_4700 + _18_5_2_8c5028b_1520331958226_797849_5177 + _18_5_2_8c5028b_1520101236705_739681_5317 + _18_5_2_8c5028b_1506517160021_298066_5010 + _18_5_2_8c5028b_1541017131272_33574_5282 + _18_5_2_8c5028b_1506530971176_692582_5131 + _18_5_2_8c5028b_1573086824722_263445_5308 + _18_5_2_8c5028b_1506442635965_588533_4728 + _18_5_2_8c5028b_1541007983529_711547_5207 + _18_5_2_8c5028b_1543317375919_912438_5308 + _18_5_2_8c5028b_1520084972378_328811_5248 + _18_5_2_8c5028b_1520185415749_537350_5187 _18_5_2_8c5028b_1520083250383_272887_5098 + _18_5_2_8c5028b_1520084770050_759611_5210 + _18_5_2_8c5028b_1518533879331_259602_5090 + _18_5_2_8c5028b_1520185359822_325005_5132 + _18_5_2_8c5028b_1518562175741_403495_5122 - - _be00301_1073394345322_922552_1 - magicdraw_uml_standard_profile_v_0001 + + eee_1045467100313_135436_1 + + _16_8beta_8ca0285_1257244649124_794756_344 - _be00301_1077726770128_871366_1 - _be00301_1073306188629_537791_2 _9_0_be00301_1108044380615_150487_0 - - - eee_1045467100313_135436_1 + _be00301_1073394345322_922552_1 + _be00301_1073306188629_537791_2 + _be00301_1077726770128_871366_1 + magicdraw_uml_standard_profile_v_0001 - - - - - magicdraw_uml_standard_profile_v_0001 - - - - local:/PROJECT-0001da1d-78d2-4911-bbd6-9a2f816370b6?resource=com.nomagic.magicdraw.uml_umodel.shared_umodel#_18_5_2_8c5028b_1506442711620_81982_4814 - - - - _18_5_2_8c5028b_1506442711620_81982_4814 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - H4sIAAAAAAAAAAMAAAAAAAAAAAA= - - - H4sIAAAAAAAAAFPmUg4pTVVwSU1WMDBRMDCzMjK3MjBTcA0OUTAyMLTgSs7P1cvLz01Mz0zWA5MpRYnleqW5OfG5+SmpOXpg0tbJ088xKFLX2CIpxcDUyFTXJC3VQtck1ThR1yLR3ELX1MTQ2NDMxDLF3NiECwCL6DXvcgAAAA== - - - + @@ -1547,94 +1365,249 @@ + + + + + FILL_COLOR + FILL_COLOR_DESCRIPTION + + + + 406, 238, 80, 51 + + + + + + + + + magicdraw_uml_standard_profile_v_0001 + + + + local:/PROJECT-0001da1d-78d2-4911-bbd6-9a2f816370b6?resource=com.nomagic.magicdraw.uml_umodel.shared_umodel#_18_5_2_8c5028b_1506442711620_81982_4814 + + + + _18_5_2_8c5028b_1506442711620_81982_4814 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + H4sIAAAAAAAAAAMAAAAAAAAAAAA= + + + H4sIAAAAAAAAAFPmUg5PTVHwyy9TMDBTMLS0Mja3MjVScA0OUTAyMLTkSs7P1cvLz01Mz0zWA5MpRYnleqW5OfG5+SmpOXpg0tbJ088xKFLXNM3YLMUoxVTXNNHQSNfEwNJMN8k8zVLXPMnIzCA52SzJKCmFCwAsHZJecgAAAA== + - H4sIAAAAAAAAAFPmUg4pTVVwSU1WMDBRMDCzMjK3MjBTcA0OUTAyMLTgAgA2LokeIAAAAA== + H4sIAAAAAAAAAFPmUg5PTVHwyy9TMDBTMLS0Mja3MjVScA0OUTAyMLTkAgAYGtCIIAAAAA== - + - + - - - - - - - - - - - - - <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> - - - - - - - - - - - - - - - - - - - - <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> - - - - - - - - - - - - - - - - - - - - - - <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> - - - - - - - - - - @@ -1837,6 +1810,14 @@ + + + + + + + + @@ -1904,10 +1885,75 @@ + + + + + + + + + + + + + <_extensionEndOfType href="#_12_1_8f90291_1173963939937_399630_100"/> + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081772108_624594_276"/> + + + + + + + + + + + + + + + + + + + + + + <_extensionEndOfType href="#_10_0EAPbeta_be00301_1123081771136_580423_99"/> + + + + + + + + + + - H4sIAAAAAAAAAMVVPW/bMBDd9SsEhCsFUd8KoCFJM7RDW6ReMgk0ebZYSKRA0m3970vbspM6lmOjhqNBEI/v7h3vHk83D6rrqRVT0Qq79EFavfRuJgvwPwHzw8QPs9sovw0z//HHxI9CUng9aKMkbTFTXSBVR+eCBes31/R3wJSGoNfqJzAbqN4KJU2w9Rnsg7m6XCjvcIRF19ad4tAGpqEa+GZRnQP27j9/vXt6xnEx5WEapTiZQYETiCkuaF7gNCExyZKS53FSnYH9J2Mmgg4s3bAPJ6veA+xHcOY/y8BI2ptG2YCDYVr0VulXn2Y/6klO3gbVKkbbuv7+9O3L48MENUWep2kBZRQlM0ISnoYcKJnFJSWMkLLWYNRCM6gdJ+IDKeJMIL47DOLDaRDfJlFdle1Fz/dCUi3ArGrijNZ9Vsc2RzTHwAm365RkjhHkXEgALeR8RHVj8JGah2FIOCUcNXnBI9QkJSGomU55hpqSRrOCZHEeTrOxcuyIEV/pfTGUZVD8bnm8FddN4o3OXU+EsSBd6daZDSLutfhFLXDoQXK3u2wd6o3ez3G+rO4vUvqrcI8p+9A83oh3b7D/p7936CqefgNfBvlp434z568q9Q+9Z/vdHvjwlg6v2PCKDK+48Guq6hzwe/2p3bOWYK+EtOasn/QxX+8vemMfpNcIAAA= + H4sIAAAAAAAAAMVVwW6jMBC98xVI9dUIkwChEoe26mH30F11K616QsYzCV6BjWynu/n7JQlJu2lIE22UckB4/GbeeOZ5uLrTTcudLGUt3cJH5czCu/qJ4D/oFz9MfJZdj9LrOPLvfzz5Ucgyr0VjteI1FboJlG74TIpg9QbDfwdCGwxao3+hcIFundTKBhuf3t6b8/OF8m6/PNw8PtN4OkoggpjGnEV0HGYJLdNpRtMySkIhkjIqIT8B6+3PbN7URaMB68BW3CCsF/kp4H8iCxk06Pga1Z8s/wiwG6Ez/1kEVvHWVtoFgFYY2Tpt3nza3ahHOXlrVK0Fr4vi++O3r/d3T6SapGkcTzCLovGUsTHEISBn01HGmWAsKwxaPTcCi46TQE9KQEgC28MQ6E9DYJNEflG2Vz3fSsWNRLusSWd03Wd+aHNAGwI74TaNVqJjRDWTCtFINRtQxxB8oOZhGDLgDEiVTiAi1ThjjFRlCQmpMh5NJywZpWGZDJVjS0xgqct5X5Zemdvl4VZcNol3Ou96Iq1D1ZVulVkv4tbIF+4QsEUF3e6i7lDv9H6K83l1f5bSX4R7SNn75vFavDuD/T/9vX1X8fgb+DpwjxvL63l8Ual/6j3b7XbPRzd0dMlGl2R0yUXfUuWngD/qT9E9Kwm2WipnT/qZHvL1/gK8rNrR1wgAAA== \ No newline at end of file diff --git a/uml2es/umlProfile/magicdraw/profile.png b/uml2es/umlProfile/magicdraw/profile.png index d89466e..38a0ddc 100644 Binary files a/uml2es/umlProfile/magicdraw/profile.png and b/uml2es/umlProfile/magicdraw/profile.png differ