Skip to content

Commit eb7395f

Browse files
keilwkeilw
committed
#97 Update UML Diagrams:
#97
1 parent 520653e commit eb7395f

13 files changed

Lines changed: 161 additions & 128 deletions

‎src/main/emf/model.notation‎

Lines changed: 85 additions & 73 deletions
Large diffs are not rendered by default.

‎src/main/emf/model.uml‎

Lines changed: 76 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,16 @@
303303
</ownedComment>
304304
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7ir8HY5EeSqtc-Sb9aJnA" type="_f682CnY5EeSqtc-Sb9aJnA" direction="return"/>
305305
</ownedOperation>
306+
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m1XY5EeSqtc-Sb9aJnA" name="inverse">
307+
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m1nY5EeSqtc-Sb9aJnA">
308+
<body>
309+
* Returns the inverse of this unit.
310+
*
311+
* @return {@code 1 / this}
312+
</body>
313+
</ownedComment>
314+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m13Y5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
315+
</ownedOperation>
306316
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7ir8XY5EeSqtc-Sb9aJnA" name="isCompatible">
307317
<ownedComment xmi:type="uml:Comment" xmi:id="_f7ir8nY5EeSqtc-Sb9aJnA">
308318
<body xsi:nil="true"/>
@@ -365,20 +375,46 @@
365375
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7sc7HY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
366376
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7sc7XY5EeSqtc-Sb9aJnA" name="symbol" type="_f7ir43Y5EeSqtc-Sb9aJnA"/>
367377
</ownedOperation>
368-
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7sc73Y5EeSqtc-Sb9aJnA" name="shift">
369-
<ownedComment xmi:type="uml:Comment" xmi:id="_f7sc8HY5EeSqtc-Sb9aJnA">
378+
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m2HY5EeSqtc-Sb9aJnA" name="divide_double">
379+
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m2XY5EeSqtc-Sb9aJnA">
370380
<body xsi:nil="true"/>
371381
</ownedComment>
372-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7sc8XY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
373-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7sc8nY5EeSqtc-Sb9aJnA" name="offset" type="_f7sc7nY5EeSqtc-Sb9aJnA"/>
382+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m2nY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
383+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m23Y5EeSqtc-Sb9aJnA" name="divisor" type="_f7sc7nY5EeSqtc-Sb9aJnA"/>
384+
</ownedOperation>
385+
<ownedOperation xmi:type="uml:Operation" xmi:id="_BCQ2oHQ9EemkGNry2_5b9w" name="divide_num">
386+
<ownedComment xmi:type="uml:Comment" xmi:id="_BCQ2oXQ9EemkGNry2_5b9w">
387+
<body xsi:nil="true"/>
388+
</ownedComment>
389+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_BCQ2onQ9EemkGNry2_5b9w" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
390+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_BCQ2o3Q9EemkGNry2_5b9w" name="divisor" type="_CgZx5nWcEeSrSaxu8IGQmg"/>
391+
</ownedOperation>
392+
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m3HY5EeSqtc-Sb9aJnA" name="divide">
393+
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m3XY5EeSqtc-Sb9aJnA">
394+
<body>
395+
* Returns the quotient of this unit with the one specified.
396+
*
397+
* @param that the unit divisor.
398+
* @return {@code this / that}
399+
</body>
400+
</ownedComment>
401+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m3nY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
402+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m33Y5EeSqtc-Sb9aJnA" name="divisor" type="_f7Zh8HY5EeSqtc-Sb9aJnA"/>
374403
</ownedOperation>
375-
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7sc83Y5EeSqtc-Sb9aJnA" name="multiply">
404+
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7sc83Y5EeSqtc-Sb9aJnA" name="multiply_double">
376405
<ownedComment xmi:type="uml:Comment" xmi:id="_f7sc9HY5EeSqtc-Sb9aJnA">
377406
<body xsi:nil="true"/>
378407
</ownedComment>
379408
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7sc9XY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
380409
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m0HY5EeSqtc-Sb9aJnA" name="multiplier" type="_f7sc7nY5EeSqtc-Sb9aJnA"/>
381410
</ownedOperation>
411+
<ownedOperation xmi:type="uml:Operation" xmi:id="_5kUJQHQ6EemkGNry2_5b9w" name="multiply_num">
412+
<ownedComment xmi:type="uml:Comment" xmi:id="_5kUJQXQ6EemkGNry2_5b9w">
413+
<body xsi:nil="true"/>
414+
</ownedComment>
415+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_5kUJQnQ6EemkGNry2_5b9w" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
416+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_5kUJQ3Q6EemkGNry2_5b9w" name="multiplier" type="_CgZx5nWcEeSrSaxu8IGQmg"/>
417+
</ownedOperation>
382418
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m0XY5EeSqtc-Sb9aJnA" name="multiply">
383419
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m0nY5EeSqtc-Sb9aJnA">
384420
<body>
@@ -391,34 +427,17 @@
391427
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m03Y5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
392428
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m1HY5EeSqtc-Sb9aJnA" name="multiplier" type="_f7Zh8HY5EeSqtc-Sb9aJnA"/>
393429
</ownedOperation>
394-
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m1XY5EeSqtc-Sb9aJnA" name="inverse">
395-
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m1nY5EeSqtc-Sb9aJnA">
396-
<body>
397-
* Returns the inverse of this unit.
398-
*
399-
* @return {@code 1 / this}
400-
</body>
401-
</ownedComment>
402-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m13Y5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
403-
</ownedOperation>
404-
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m2HY5EeSqtc-Sb9aJnA" name="divide">
405-
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m2XY5EeSqtc-Sb9aJnA">
406-
<body xsi:nil="true"/>
407-
</ownedComment>
408-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m2nY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
409-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m23Y5EeSqtc-Sb9aJnA" name="divisor" type="_f7sc7nY5EeSqtc-Sb9aJnA"/>
410-
</ownedOperation>
411-
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m3HY5EeSqtc-Sb9aJnA" name="divide">
412-
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m3XY5EeSqtc-Sb9aJnA">
430+
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m5HY5EeSqtc-Sb9aJnA" name="pow">
431+
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m5XY5EeSqtc-Sb9aJnA">
413432
<body>
414-
* Returns the quotient of this unit with the one specified.
433+
* Returns a unit equals to this unit raised to an exponent.
415434
*
416-
* @param that the unit divisor.
417-
* @return {@code this / that}
435+
* @param n the exponent.
436+
* @return the result of raising this unit to the exponent.
418437
</body>
419438
</ownedComment>
420-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m3nY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
421-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m33Y5EeSqtc-Sb9aJnA" name="divisor" type="_f7Zh8HY5EeSqtc-Sb9aJnA"/>
439+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X0HY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
440+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X0XY5EeSqtc-Sb9aJnA" name="n" type="_f6zFDHY5EeSqtc-Sb9aJnA"/>
422441
</ownedOperation>
423442
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m4HY5EeSqtc-Sb9aJnA" name="root">
424443
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m4XY5EeSqtc-Sb9aJnA">
@@ -434,32 +453,31 @@
434453
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m4nY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
435454
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f71m43Y5EeSqtc-Sb9aJnA" name="n" type="_f6zFDHY5EeSqtc-Sb9aJnA"/>
436455
</ownedOperation>
437-
<ownedOperation xmi:type="uml:Operation" xmi:id="_f71m5HY5EeSqtc-Sb9aJnA" name="pow">
438-
<ownedComment xmi:type="uml:Comment" xmi:id="_f71m5XY5EeSqtc-Sb9aJnA">
456+
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7sc73Y5EeSqtc-Sb9aJnA" name="shift">
457+
<ownedComment xmi:type="uml:Comment" xmi:id="_f7sc8HY5EeSqtc-Sb9aJnA">
458+
<body xsi:nil="true"/>
459+
</ownedComment>
460+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7sc8XY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
461+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7sc8nY5EeSqtc-Sb9aJnA" name="offset" type="_f7sc7nY5EeSqtc-Sb9aJnA"/>
462+
</ownedOperation>
463+
<ownedOperation xmi:type="uml:Operation" xmi:id="_GCKxEHQ7EemkGNry2_5b9w" name="shift_num">
464+
<ownedComment xmi:type="uml:Comment" xmi:id="_GCKxEXQ7EemkGNry2_5b9w">
465+
<body xsi:nil="true"/>
466+
</ownedComment>
467+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_GCKxEnQ7EemkGNry2_5b9w" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
468+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_GCKxE3Q7EemkGNry2_5b9w" name="offset" type="_CgZx5nWcEeSrSaxu8IGQmg"/>
469+
</ownedOperation>
470+
<ownedOperation xmi:type="uml:Operation" xmi:id="_YROScHLlEeilgvRHPaOOsg" name="prefix">
471+
<ownedComment xmi:type="uml:Comment" xmi:id="_YROScXLlEeilgvRHPaOOsg">
439472
<body>
440473
* Returns a unit equals to this unit raised to an exponent.
441474
*
442475
* @param n the exponent.
443476
* @return the result of raising this unit to the exponent.
444477
</body>
445478
</ownedComment>
446-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X0HY5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
447-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X0XY5EeSqtc-Sb9aJnA" name="n" type="_f6zFDHY5EeSqtc-Sb9aJnA"/>
448-
</ownedOperation>
449-
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7_X0nY5EeSqtc-Sb9aJnA" name="toString">
450-
<ownedComment xmi:type="uml:Comment" xmi:id="_f7_X03Y5EeSqtc-Sb9aJnA">
451-
<body>
452-
* Returns a string representation of this unit. The string representation may
453-
* be the unit {@linkplain #getSymbol() symbol}, or may be some representation
454-
* of {@linkplain #getBaseUnits() base units}, multiplication factor and
455-
* offset if any. The string may be localized at implementation choice.
456-
*
457-
* @return the (eventually localized) string representation of this unit.
458-
*
459-
* @see #getSymbol()
460-
</body>
461-
</ownedComment>
462-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X1HY5EeSqtc-Sb9aJnA" type="_f7ir43Y5EeSqtc-Sb9aJnA" direction="return"/>
479+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_YROScnLlEeilgvRHPaOOsg" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
480+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_YROSc3LlEeilgvRHPaOOsg" name="prefix" type="_il06sHC0EeiPSP_DaMvzsA"/>
463481
</ownedOperation>
464482
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7_X1XY5EeSqtc-Sb9aJnA" name="transform">
465483
<ownedComment xmi:type="uml:Comment" xmi:id="_f7_X1nY5EeSqtc-Sb9aJnA">
@@ -479,17 +497,20 @@
479497
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X13Y5EeSqtc-Sb9aJnA" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
480498
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X2HY5EeSqtc-Sb9aJnA" name="converter" type="_f8JI0HY5EeSqtc-Sb9aJnA"/>
481499
</ownedOperation>
482-
<ownedOperation xmi:type="uml:Operation" xmi:id="_YROScHLlEeilgvRHPaOOsg" name="prefix">
483-
<ownedComment xmi:type="uml:Comment" xmi:id="_YROScXLlEeilgvRHPaOOsg">
500+
<ownedOperation xmi:type="uml:Operation" xmi:id="_f7_X0nY5EeSqtc-Sb9aJnA" name="toString">
501+
<ownedComment xmi:type="uml:Comment" xmi:id="_f7_X03Y5EeSqtc-Sb9aJnA">
484502
<body>
485-
* Returns a unit equals to this unit raised to an exponent.
503+
* Returns a string representation of this unit. The string representation may
504+
* be the unit {@linkplain #getSymbol() symbol}, or may be some representation
505+
* of {@linkplain #getBaseUnits() base units}, multiplication factor and
506+
* offset if any. The string may be localized at implementation choice.
486507
*
487-
* @param n the exponent.
488-
* @return the result of raising this unit to the exponent.
508+
* @return the (eventually localized) string representation of this unit.
509+
*
510+
* @see #getSymbol()
489511
</body>
490512
</ownedComment>
491-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_YROScnLlEeilgvRHPaOOsg" type="_f7Zh8HY5EeSqtc-Sb9aJnA" direction="return"/>
492-
<ownedParameter xmi:type="uml:Parameter" xmi:id="_YROSc3LlEeilgvRHPaOOsg" name="prefix" type="_il06sHC0EeiPSP_DaMvzsA"/>
513+
<ownedParameter xmi:type="uml:Parameter" xmi:id="_f7_X1HY5EeSqtc-Sb9aJnA" type="_f7ir43Y5EeSqtc-Sb9aJnA" direction="return"/>
493514
</ownedOperation>
494515
</packagedElement>
495516
<packagedElement xmi:type="uml:Interface" xmi:id="_f6zFAHY5EeSqtc-Sb9aJnA" name="Dimension">

‎src/site/resources/images/AbstractSystemOfUnits.PNG‎

11.9 KB
Loading

‎src/site/resources/images/Dimension.PNG‎

8.87 KB
Loading

‎src/site/resources/images/Measurement.PNG‎

14 KB
Loading

‎src/site/resources/images/Prefix.PNG‎

5.54 KB
Loading

‎src/site/resources/images/Quantity.PNG‎

17.9 KB
Loading

‎src/site/resources/images/QuantityFactory.PNG‎

7.5 KB
Loading

‎src/site/resources/images/QuantityFormat.PNG‎

9.75 KB
Loading

‎src/site/resources/images/Range.PNG‎

38.6 KB
Loading

0 commit comments

Comments
 (0)