公开(公告)号：US08924193B2

公开(公告)日：2014-12-30

申请号：US13828312

申请日：2013-03-14

Applicant: The MathWorks, Inc.

Inventor： Timothy Hosey ,  Robert O. Aberg ,  Ebrahim Mehran Mestchian

IPC: G06F17/50

CPC classification number: G06F17/5009 ,  G06F8/71

Abstract: A device receives model information associated with a modeling application. The device determines first and second conflicting information in the model information. The first and second conflicting information describe different characteristics of a model described by the model information. The device formats the first and second conflicting information in a manner that designates the first conflicting information as a first variant of the model and the second conflicting information as a second variant of the model. The model, when executed with the first variant, behaves in a different manner than when executed with the second variant. The device provides the formatted first and second conflicting information to the modeling application, provides information that identifies the first and second variant, receives a user selection of information that identifies the first variant or second variant, and executes the model based on the user selection.

Abstract translation: 设备接收与建模应用相关联的模型信息。 设备确定模型信息中的第一和第二冲突信息。 第一和第二冲突信息描述了由模型信息描述的模型的不同特征。 该设备以指定第一冲突信息作为模型的第一变体并且第二冲突信息作为模型的第二变体的方式来格式化第一和第二冲突信息。 当与第一个变体一起执行时，该模型的行为与使用第二个变体执行的方式不同。 设备向建模应用提供格式化的第一和第二冲突信息，提供标识第一和第二变体的信息，接收用户选择标识第一变体或第二变体的信息，并且基于用户选择来执行模型。

公开(公告)号：US09330131B2

公开(公告)日：2016-05-03

申请号：US13765055

申请日：2013-02-12

Applicant: The MathWorks, Inc.

Inventor： Timothy Hosey

IPC: G06F17/30 ,  G06F9/44

CPC classification number: G06F17/30371 ,  G06F8/71

Abstract: A device receives a conflicted file, with a structured data format, that includes a conflict marker that does not comply with the structured data format. The conflict marker identifies first edited information and second edited information included in the conflicted file. The first edited information and the second edited information comply with the structured data format, and include information that has been modified in different versions of a shared file to create the conflicted file. The device detects that the conflicted file includes the conflict marker, and identifies, based on the detected conflict marker, the first edited information and the second edited information. The device determines that at least one of the first edited information or the second edited information is to be provided to the application for processing, and provides, based on the determining, the first edited information or the second edited information to the application for processing.

Abstract translation: 设备接收具有结构化数据格式的冲突文件，其中包括不符合结构化数据格式的冲突标记。 冲突标记识别冲突文件中包含的第一编辑信息和第二编辑信息。 第一编辑信息和第二编辑信息符合结构化数据格式，并包括在不同版本的共享文件中进行了修改以创建冲突文件的信息。 设备检测到冲突文件包括冲突标记，并且基于检测到的冲突标记来识别第一编辑信息和第二编辑信息。 该设备确定要将第一编辑信息或第二编辑信息中的至少一个提供给应用程序进行处理，并且基于确定第一编辑信息或第二编辑信息提供给应用程序进行处理。