added enum pretty printing tests

resources/Enums/haskellEnum1.hs

@@ -0,0 +1,13 @@
+{-The enumerated values to specified the period, e.g. day, week.-}
+data PeriodEnum =
+    {-Day-}
+    D
+    {-Month-}
+    | M
+    {-Year-}
+    | Y
+
+instance Show PeriodEnum where
+    show D = "day"
+    show M = "month"
+    show Y = "year"

resources/Enums/haskellEnum2.hs

@@ -0,0 +1,13 @@
+{-The enumerated values to specified the period, e.g. day, week.-}
+data EnumWithoutDisplay =
+    {-Day-}
+    D
+    {-Month-}
+    | M
+    {-Year-}
+    | Y
+
+instance Show EnumWithoutDisplay where
+    show D = "D"
+    show M = "M"
+    show Y = "Y"

resources/Enums/haskellEnum3.hs

@@ -0,0 +1,7 @@
+data EnumWithoutDescription =
+    X
+    | Y
+
+instance Show EnumWithoutDescription where
+    show X = "xs"
+    show Y = "ys"

resources/testAll.rosetta

@@ -35,9 +35,9 @@ func EquityPriceObservation: <"Function specification for the observation of an
 
 func Something: <"asd">
     inputs:
-        equity1 boolean (1..1)
-      determinationMethod ObservationPrimitive (1..1)
+      equity1 boolean (1..1)
+      valuationTime ObservationPrimitive (1..1)
     output:
-        valuation ObservationPrimitive (0..1)
+        valuation ObservationPrimitive (0..*)
 
-    assign-output: if True and False then determinationMethod
+    assign-output: if True and False then valuationTime

resources/testFunction.rosetta

@@ -1,11 +1,44 @@
 func EquityPriceObservation: <"Function specification for the observation of an equity price, based on the attributes of the 'EquityValuation' class.">
    inputs:
-      equity Equity (1..1)
-      valuationDate AdjustableOrRelativeDate (1..1)
-      valuationTime BusinessCenterTime (0..1)
-      timeType TimeTypeEnum (0..1)
-      determinationMethod DeterminationMethodEnum (1..*)
+      equity int (1..1)
+      determinationMethod ObservationPrimitive (1..1)
    output:
-      observation ObservationPrimitive (1..1)
+      observation ObservationPrimitive (0..1)
 
-   assign-output: if asd exists then var2
+   assign-output: if True and False then valuationDate
+
+func EquityPriceObservation: <"Function specification for the observation of an equity price, based on the attributes of the 'EquityValuation' class.">
+  inputs:
+     equity int (1..1)
+     determinationMethod ObservationPrimitive (1..1)
+  output:
+     observation ObservationPrimitive (0..*)
+
+  assign-output: if True and False then valuationDate
+
+func EquityPriceObservation: <"Function specification for the observation of an equity price, based on the attributes of the 'EquityValuation' class.">
+ inputs:
+    equity int (1..1)
+    determinationMethod ObservationPrimitive (1..1)
+ output:
+    observation ObservationPrimitive (1..1)
+
+ assign-output: if True and False then valuationDate
+
+func EquityPriceObservation: <"Function specification for the observation of an equity price, based on the attributes of the 'EquityValuation' class.">
+inputs:
+   equity int (1..1)
+   determinationMethod ObservationPrimitive (1..1)
+output:
+   observation ObservationPrimitive (1..*)
+
+assign-output: if True and False then valuationDate
+
+func EquityPriceObservation: <"Function specification for the observation of an equity price, based on the attributes of the 'EquityValuation' class.">
+inputs:
+  equity int (1..1)
+  determinationMethod ObservationPrimitive (1..1)
+output:
+  observation ObservationPrimitive (*..*)
+
+assign-output: if True and False then valuationDate