Commit 0df809be authored by shumim's avatar shumim
Browse files

S5-240805/0806/0811 inference function related

parent 5a946b7a
Loading
Loading
Loading
Loading
Loading
+67 −7
Original line number Diff line number Diff line
@@ -173,6 +173,26 @@ components:
        mLEntityRef:
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    InferenceOutput:
      type: object
      properties:
        inferenceOutputId:
          type: array
          items:
            type: string
        inferenceType:
          type: string
        inferenceOutputTime:
          type: array
          items:
            $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime'
          # FIXME, isOrder/isUnique both as True
        inferencePerformance:
          $ref: '#/components/schemas/ModelPerformance'          
        outputResult:
          description: A map (list of key-value pairs) for Inference result name and it's value
          $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet'
          
#-------- Definition of abstract IOCs --------------------------------------------


@@ -662,11 +682,46 @@ components:
                      $ref: '#/components/schemas/ManagedActivationScope'
                    usedByFunctionRefList:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                    mLEntityRef:   # FIXME S5-240805,S5-240917 both define here
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
        - type: object
          properties:
            MLEntity:
              $ref: '#/components/schemas/MLEntity-Multiple'
            AIMLInferenceReport:
              $ref: '#/components/schemas/AIMLInferenceReport-Multiple'

    AIMLInferenceReport-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties: 
            attributes:
              allOf:
                - type: object
                  properties:
                    inferenceOutputs:  #stage 2: attribute table name as: aimlInferenceOutputs  FIXME
                      type: array
                      items:
                        $ref: '#/components/schemas/InferenceOutput'
                      minItems: 1
                    mLEntityRef:
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'

    AIMLInferenceEmulationFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                - type: object
                  properties:
                    mLInferenceEmulationFunctionId:  #stage 2 definition missing  FIXME
                      type: string
                    mLInferenceEmulationReportRefs: # FIXME stage 2 of IOC AIMLInferenceEmulationReport missing
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

#-------- Definition of JSON arrays for name-contained IOCs ----------------------

@@ -718,10 +773,6 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/MLTestingRequest-Single'
    MLInferenceFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/MLInferenceFunction-Single'
    MLEntityLoadingRequest-Multiple:
      type: array
      items:
@@ -754,7 +805,14 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/AIMLInferenceFunction-Single'

    AIMLInferenceReport-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AIMLInferenceReport-Single'
    AIMLInferenceEmulationFunction-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Single'
#-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------

    resources-AiMlNrm:
@@ -782,3 +840,5 @@ components:
        - $ref: '#/components/schemas/MLUpdateProcess-Single'
        - $ref: '#/components/schemas/MLUpdateReport-Single'
        - $ref: '#/components/schemas/AIMLInferenceFunction-Single'
        - $ref: '#/components/schemas/AIMLInferenceReport-Single'
        - $ref: '#/components/schemas/AIMLInferenceEmulationFunction-Single'